stv0g/re
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

natbd segfault and debug fixes

Browse source
This commit is contained in:
Richard Aas 2011-01-17 15:24:55 +00:00
parent c069895ffe
commit e8fdeec394
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/natbd/lifetime.c
View file

@ -35,6 +35,8 @@
/** Defines a NAT Binding Lifetime Discovery session */
struct nat_lifetime {
struct stun *stun; /**< STUN Client */
struct stun_ctrans *ctx; /**< STUN Transaction 1 */
struct stun_ctrans *cty; /**< STUN Transaction 2 */
struct udp_sock *us_x; /**< First UDP socket */
struct udp_sock *us_y; /**< Second UDP socket */
struct sa srv; /**< Server IP-address/port */
@ -181,8 +183,9 @@ static int start_test(struct nat_lifetime *nl)
tmr_cancel(&nl->tmr);
return stun_request(NULL, nl->stun, IPPROTO_UDP, nl->us_x, &nl->srv, 0,
STUN_METHOD_BINDING, NULL, 0, false,
nl->ctx = mem_deref(nl->ctx);
return stun_request(&nl->ctx, nl->stun, IPPROTO_UDP, nl->us_x,
&nl->srv, 0, STUN_METHOD_BINDING, NULL, 0, false,
stun_response_handler_x, nl, 1,
STUN_ATTR_SOFTWARE, stun_software);
}
@ -196,8 +199,9 @@ static void timeout(void *arg)
nl->probing = true;
err = stun_request(NULL, nl->stun, IPPROTO_UDP, nl->us_y, &nl->srv, 0,
STUN_METHOD_BINDING, NULL, 0, false,
nl->cty = mem_deref(nl->cty);
err = stun_request(&nl->cty, nl->stun, IPPROTO_UDP, nl->us_y,
&nl->srv, 0, STUN_METHOD_BINDING, NULL, 0, false,
stun_response_handler_y, nl, 2,
STUN_ATTR_RESP_PORT, &rp,
STUN_ATTR_SOFTWARE, stun_software);
@ -250,6 +254,8 @@ static void lifetime_destructor(void *data)
tmr_cancel(&nl->tmr);
mem_deref(nl->ctx);
mem_deref(nl->cty);
mem_deref(nl->us_x);
mem_deref(nl->us_y);
mem_deref(nl->stun);

4
src/natbd/mapping.c
View file

@ -84,7 +84,9 @@ static void stun_response_handler(int err, uint16_t scode, const char *reason,
map = stun_msg_attr(msg, STUN_ATTR_MAPPED_ADDR);
if (!map || !other) {
DEBUG_WARNING("mapped- or other-addr attr missing\n");
DEBUG_WARNING("missing attributes: %s %s\n",
map ? "" : "MAPPED-ADDR",
other ? "" : "OTHER-ADDR");
nm->mh(EPROTO, NAT_TYPE_UNKNOWN, nm->arg);
return;
}