diff options
author | Benny Prijono <bennylp@teluu.com> | 2007-04-02 19:11:41 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2007-04-02 19:11:41 +0000 |
commit | 8a7b64c3c0c37371d8d84dbd505d0695ca18d73e (patch) | |
tree | ccfef285822de3ba718615ba4c8087a6a19e8493 | |
parent | c6919558d33e74238bb7f1942e416f3a1aefdd02 (diff) |
Fixed couple of compilation warnings in STUN and new proxy samples with gcc
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1131 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r-- | pjnath/src/pjnath/stun_msg.c | 6 | ||||
-rw-r--r-- | pjsip-apps/src/samples/proxy.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c index 5b54ff38..da919f8f 100644 --- a/pjnath/src/pjnath/stun_msg.c +++ b/pjnath/src/pjnath/stun_msg.c @@ -717,7 +717,7 @@ static pj_status_t decode_sockaddr_attr(pj_pool_t *pool, attr->sockaddr.ipv4.sin_addr.s_addr = GETVAL32N(buf, ATTR_HDR_LEN+4); /* Done */ - *p_attr = attr; + *p_attr = (void*)attr; return PJ_SUCCESS; } @@ -730,10 +730,12 @@ static pj_status_t decode_xored_sockaddr_attr(pj_pool_t *pool, pj_stun_sockaddr_attr *attr; pj_status_t status; - status = decode_sockaddr_attr(pool, buf, &attr); + status = decode_sockaddr_attr(pool, buf, p_attr); if (status != PJ_SUCCESS) return status; + attr = *(pj_stun_sockaddr_attr**)p_attr; + attr->xor_ed = PJ_TRUE; attr->sockaddr.ipv4.sin_port ^= pj_htons(0x2112); attr->sockaddr.ipv4.sin_addr.s_addr ^= pj_htonl(0x2112A442); diff --git a/pjsip-apps/src/samples/proxy.h b/pjsip-apps/src/samples/proxy.h index 5f62a503..595ecd4f 100644 --- a/pjsip-apps/src/samples/proxy.h +++ b/pjsip-apps/src/samples/proxy.h @@ -77,7 +77,7 @@ static pj_status_t init_options(int argc, char *argv[]) switch (c) { case 'p': global.port = atoi(pj_optarg); - printf("Port is set to %d\n", global.pool); + printf("Port is set to %d\n", global.port); break; case 'R': |