sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "res_pjproject: Fix sockaddr conversion routines for non-bundled PJSIP" into 16

This commit is contained in:
Jenkins2 2018-09-13 07:09:34 -05:00 committed by Gerrit Code Review
parent 7ed02b4925 e5739c494c
commit 39829f0a78
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
res/res_pjproject.c
View File

@ -478,7 +478,11 @@ int ast_sockaddr_to_pj_sockaddr(const struct ast_sockaddr *addr, pj_sockaddr *pj
if (addr->ss.ss_family == AF_INET) {
struct sockaddr_in *sin = (struct sockaddr_in *) &addr->ss;
pjaddr->ipv4.sin_family = pj_AF_INET();
pjaddr->ipv4.sin_addr = sin->sin_addr;
#ifdef HAVE_PJPROJECT_BUNDLED
pjaddr->ipv4.sin_addr = sin->sin_addr;
#else
pjaddr->ipv4.sin_addr.s_addr = sin->sin_addr.s_addr;
#endif
pjaddr->ipv4.sin_port = sin->sin_port;
} else if (addr->ss.ss_family == AF_INET6) {
struct sockaddr_in6 *sin = (struct sockaddr_in6 *) &addr->ss;
@ -499,7 +503,11 @@ int ast_sockaddr_from_pj_sockaddr(struct ast_sockaddr *addr, const pj_sockaddr *
if (pjaddr->addr.sa_family == pj_AF_INET()) {
struct sockaddr_in *sin = (struct sockaddr_in *) &addr->ss;
sin->sin_family = AF_INET;
sin->sin_addr = pjaddr->ipv4.sin_addr;
#ifdef HAVE_PJPROJECT_BUNDLED
sin->sin_addr = pjaddr->ipv4.sin_addr;
#else
sin->sin_addr.s_addr = pjaddr->ipv4.sin_addr.s_addr;
#endif
sin->sin_port = pjaddr->ipv4.sin_port;
addr->len = sizeof(struct sockaddr_in);
} else if (pjaddr->addr.sa_family == pj_AF_INET6()) {