acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Merge branch 'master' into s1ap

This commit is contained in:
Sukchan Lee 2018-03-21 14:06:20 +09:00
parent a9e5283db3 87b6896128
commit 13ece7f4d4
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/s1ap/asn1c/Makefile.am
View File

@ -1143,11 +1143,9 @@ AM_CPPFLAGS = \
AM_CFLAGS = \
${ASN_MODULE_CFLAGS} \
-Wno-overflow -Wno-format \
-Wno-parentheses-equality -Wno-overflow -Wno-format \
$(NULL)
# -Wall -Wno-parentheses-equality -Wno-overflow
MAINTAINERCLEANFILES = Makefile.in
MOSTLYCLEANFILES = core *.stackdump

2
src/mme/s1ap_path.c
View File

@ -470,7 +470,7 @@ status_t s1ap_send_mme_configuration_transfer(
mme_enb_t *target_enb, pkbuf_t *recvbuf)
{
status_t rv;
char *payload;
unsigned char *payload;
pkbuf_t *sendbuf = NULL;
d_assert(target_enb, return CORE_ERROR,);

7
src/pgw/pgw_gtp_path.c
View File

@ -294,8 +294,15 @@ static status_t pgw_gtp_handle_multicast(pkbuf_t *recvbuf)
ip_h = (struct ip *)recvbuf->payload;
if (ip_h->ip_v == 6)
{
#if COMPILE_ERROR_IN_MAC_OS_X /* Compiler error in Mac OS X platform */
ip6_h = (struct ip6_hdr *)recvbuf->payload;
if (IN6_IS_ADDR_MULTICAST(&ip6_h->ip6_dst))
#else
struct in6_addr ip6_dst;
ip6_h = (struct ip6_hdr *)recvbuf->payload;
memcpy(&ip6_dst, &ip6_h->ip6_dst, sizeof(struct in6_addr));
if (IN6_IS_ADDR_MULTICAST(&ip6_dst))
#endif
{
hash_index_t *hi = NULL;