From 35b12af8b6aabb91d7dd7ef06e82a3df3d28c520 Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Mon, 8 Oct 2012 00:45:36 +0000 Subject: pjproject: Fix for Solaris builds. Do not undef s_addr. pjproject, in order to solve build problems on Windows [1], undefines s_addr in one of it's headers that is included in res_rtp_asterisk.c. On Solaris s_addr is not a structure member, but defined to map to the real strucuture member, therefore when building on Solaris it's possible to get build errors like: [CC] res_rtp_asterisk.c -> res_rtp_asterisk.o In file included from /export/home/admin/asterisk-11-svn/include/asterisk/stun.h:29, from res_rtp_asterisk.c:51: /export/home/admin/asterisk-11-svn/include/asterisk/network.h: In function `inaddrcmp': /export/home/admin/asterisk-11-svn/include/asterisk/network.h:92: error: structure has no member named `s_addr' /export/home/admin/asterisk-11-svn/include/asterisk/network.h:92: error: structure has no member named `s_addr' res_rtp_asterisk.c: In function `ast_rtp_on_ice_tx_pkt': res_rtp_asterisk.c:706: warning: dereferencing type-punned pointer will break strict-aliasing rules res_rtp_asterisk.c:710: warning: dereferencing type-punned pointer will break strict-aliasing rules res_rtp_asterisk.c: In function `rtp_add_candidates_to_ice': res_rtp_asterisk.c:1085: error: structure has no member named `s_addr' make[2]: *** [res_rtp_asterisk.o] Error 1 make[1]: *** [res] Error 2 make[1]: Leaving directory `/export/home/admin/asterisk-11-svn' gmake: *** [_cleantest_all] Error 2 Unfortunately, in order to make this work, I also had to make sure pjproject only used the typdef pj_in_addr and not the struct pj_in_addr so that when building Asterisk I could "typedef struct in_addr pj_in_addr". It's possible then that the library and users of those interfaces in Asterisk have a different idea about the type of the argument, while on the surface it looks like they are all 32 bit big endian values. [1] http://trac.pjsip.org/repos/changeset/484 (issues ASTERISK-20366) Reported by: Ben Klang Tested by: Ben Klang, mjordan patches: 0001-pjproject-Fix-for-Solaris-builds.-Do-not-undef-s.patch uploaded by Shaun Ruffell (license 5417) ........ Merged revisions 374642 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374643 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/pjproject/pjlib/include/pj/sock.h | 8 +++++++- res/pjproject/pjlib/src/pj/sock_bsd.c | 2 +- res/pjproject/pjlib/src/pj/sock_linux_kernel.c | 2 +- res/pjproject/pjlib/src/pj/sock_symbian.cpp | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/res/pjproject/pjlib/include/pj/sock.h b/res/pjproject/pjlib/include/pj/sock.h index 83d35db9b..0f8850d3b 100644 --- a/res/pjproject/pjlib/include/pj/sock.h +++ b/res/pjproject/pjlib/include/pj/sock.h @@ -471,6 +471,7 @@ typedef enum pj_socket_sd_type */ #define PJ_INVALID_SOCKET (-1) +#ifndef _ASTERISK_H /* Must undefine s_addr because of pj_in_addr below */ #undef s_addr @@ -482,6 +483,11 @@ typedef struct pj_in_addr pj_uint32_t s_addr; /**< The 32bit IP address. */ } pj_in_addr; +#else +#include +#include +typedef struct in_addr pj_in_addr; +#endif /** * Maximum length of text representation of an IPv4 address. @@ -675,7 +681,7 @@ PJ_DECL(char*) pj_inet_ntoa(pj_in_addr inaddr); * * @return nonzero if the address is valid, zero if not. */ -PJ_DECL(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp); +PJ_DECL(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp); /** * This function converts an address in its standard text presentation form diff --git a/res/pjproject/pjlib/src/pj/sock_bsd.c b/res/pjproject/pjlib/src/pj/sock_bsd.c index 9bd0356f7..3bd7121ba 100644 --- a/res/pjproject/pjlib/src/pj/sock_bsd.c +++ b/res/pjproject/pjlib/src/pj/sock_bsd.c @@ -232,7 +232,7 @@ PJ_DEF(char*) pj_inet_ntoa(pj_in_addr inaddr) * numbers-and-dots notation into binary data and stores it in the structure * that inp points to. */ -PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp) +PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp) { char tempaddr[PJ_INET_ADDRSTRLEN]; diff --git a/res/pjproject/pjlib/src/pj/sock_linux_kernel.c b/res/pjproject/pjlib/src/pj/sock_linux_kernel.c index 89c2f0e04..c7a80972d 100644 --- a/res/pjproject/pjlib/src/pj/sock_linux_kernel.c +++ b/res/pjproject/pjlib/src/pj/sock_linux_kernel.c @@ -147,7 +147,7 @@ PJ_DEF(char*) pj_inet_ntoa(pj_in_addr in) * numbers-and-dots notation into binary data and stores it in the structure * that inp points to. */ -PJ_DEF(int) pj_inet_aton(const pj_str_t *ccp, struct pj_in_addr *addr) +PJ_DEF(int) pj_inet_aton(const pj_str_t *ccp, pj_in_addr *addr) { pj_uint32_t val; int base, n; diff --git a/res/pjproject/pjlib/src/pj/sock_symbian.cpp b/res/pjproject/pjlib/src/pj/sock_symbian.cpp index 09239b07a..e72bbdad7 100644 --- a/res/pjproject/pjlib/src/pj/sock_symbian.cpp +++ b/res/pjproject/pjlib/src/pj/sock_symbian.cpp @@ -299,7 +299,7 @@ PJ_DEF(char*) pj_inet_ntoa(pj_in_addr inaddr) * numbers-and-dots notation into binary data and stores it in the structure * that inp points to. */ -PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp) +PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp) { enum { MAXIPLEN = PJ_INET_ADDRSTRLEN }; -- cgit v1.2.3