Commit 3741f217 authored by Pekka Pessi's avatar Pekka Pessi

Silenced warnings caused by mismatching integral types.

In nua_session, unsigned v. sip_time_t.
In tport.c, size_t v. socklen_t.

darcs-hash:20060512120805-65a35-02f6ff9889def9ddc94d0cb3856370f1a3798d75.gz
parent 317eecc5
...@@ -240,9 +240,9 @@ ua_invite2(nua_t *nua, nua_handle_t *nh, nua_event_t e, int restarted, ...@@ -240,9 +240,9 @@ ua_invite2(nua_t *nua, nua_handle_t *nh, nua_event_t e, int restarted,
assert(cr->cr_orq == NULL); assert(cr->cr_orq == NULL);
if (du && sip && offer_sent >= 0) { if (du && sip && offer_sent >= 0) {
unsigned invite_timeout = NH_PGET(nh, invite_timeout); sip_time_t invite_timeout = NH_PGET(nh, invite_timeout);
if (invite_timeout == 0) if (invite_timeout == 0)
invite_timeout = SIP_TIME_MAX; invite_timeout = UINT_MAX;
/* Cancel if we don't get response */ /* Cancel if we don't get response */
nua_dialog_usage_set_refresh(du, invite_timeout); nua_dialog_usage_set_refresh(du, invite_timeout);
......
...@@ -682,15 +682,18 @@ int tport_bind_socket(int socket, ...@@ -682,15 +682,18 @@ int tport_bind_socket(int socket,
char const **return_culprit) char const **return_culprit)
{ {
su_sockaddr_t *su = (su_sockaddr_t *)ai->ai_addr; su_sockaddr_t *su = (su_sockaddr_t *)ai->ai_addr;
socklen_t sulen = ai->ai_addrlen;
if (bind(socket, ai->ai_addr, ai->ai_addrlen) == -1) { if (bind(socket, ai->ai_addr, ai->ai_addrlen) == -1) {
return *return_culprit = "bind", -1; return *return_culprit = "bind", -1;
} }
if (getsockname(socket, ai->ai_addr, &ai->ai_addrlen) == SOCKET_ERROR) { if (getsockname(socket, &su->su_sa, &sulen) == SOCKET_ERROR) {
return *return_culprit = "getsockname", -1; return *return_culprit = "getsockname", -1;
} }
ai->ai_addrlen = sulen;
#if defined (__linux__) && defined (SU_HAVE_IN6) #if defined (__linux__) && defined (SU_HAVE_IN6)
if (ai->ai_family == AF_INET6) { if (ai->ai_family == AF_INET6) {
if (!SU_SOCKADDR_INADDR_ANY(su) && if (!SU_SOCKADDR_INADDR_ANY(su) &&
...@@ -2335,6 +2338,7 @@ int tport_accept(tport_primary_t *pri, int events) ...@@ -2335,6 +2338,7 @@ int tport_accept(tport_primary_t *pri, int events)
tport_t *self; tport_t *self;
su_addrinfo_t ai[1]; su_addrinfo_t ai[1];
su_sockaddr_t su[1]; su_sockaddr_t su[1];
socklen_t sulen = sizeof su;
su_socket_t s = SOCKET_ERROR, l = pri->pri_primary->tp_socket; su_socket_t s = SOCKET_ERROR, l = pri->pri_primary->tp_socket;
char const *reason = "accept"; char const *reason = "accept";
...@@ -2347,15 +2351,15 @@ int tport_accept(tport_primary_t *pri, int events) ...@@ -2347,15 +2351,15 @@ int tport_accept(tport_primary_t *pri, int events)
memcpy(ai, pri->pri_primary->tp_addrinfo, sizeof ai); memcpy(ai, pri->pri_primary->tp_addrinfo, sizeof ai);
ai->ai_canonname = NULL; ai->ai_canonname = NULL;
ai->ai_addr = &su->su_sa, ai->ai_addrlen = sizeof su; s = accept(l, &su->su_sa, &sulen);
s = accept(l, ai->ai_addr, &ai->ai_addrlen);
if (s < 0) { if (s < 0) {
tport_error_report(pri->pri_primary, su_errno(), NULL); tport_error_report(pri->pri_primary, su_errno(), NULL);
return 0; return 0;
} }
ai->ai_addr = &su->su_sa, ai->ai_addrlen = sulen;
/* Alloc a new transport object, then register socket events with it */ /* Alloc a new transport object, then register socket events with it */
self = tport_alloc_secondary(pri, s, 1, &reason); self = tport_alloc_secondary(pri, s, 1, &reason);
...@@ -3274,7 +3278,7 @@ int tport_send_error(tport_t *self, msg_t *msg, ...@@ -3274,7 +3278,7 @@ int tport_send_error(tport_t *self, msg_t *msg,
else if (self->tp_addrinfo->ai_family == AF_INET6) { else if (self->tp_addrinfo->ai_family == AF_INET6) {
su_sockaddr_t const *su = msg_addr(msg); su_sockaddr_t const *su = msg_addr(msg);
SU_DEBUG_3(("tport_vsend(%p): %s with " SU_DEBUG_3(("tport_vsend(%p): %s with "
"(s=%d, IP6=%s/%s:%s%s (scope=%i) addrlen=%d)\n", "(s=%d, IP6=%s/%s:%s%s (scope=%i) addrlen=%zd)\n",
self, su_strerror(error), self->tp_socket, self, su_strerror(error), self->tp_socket,
tpn->tpn_proto, tpn->tpn_host, tpn->tpn_port, comp, tpn->tpn_proto, tpn->tpn_host, tpn->tpn_port, comp,
su->su_scope_id, *msg_addrlen(msg))); su->su_scope_id, *msg_addrlen(msg)));
...@@ -3282,7 +3286,7 @@ int tport_send_error(tport_t *self, msg_t *msg, ...@@ -3282,7 +3286,7 @@ int tport_send_error(tport_t *self, msg_t *msg,
#endif #endif
else { else {
SU_DEBUG_3(("\ttport_vsend(%p): %s with " SU_DEBUG_3(("\ttport_vsend(%p): %s with "
"(s=%d, AF=%u addrlen=%d)%s\n", "(s=%d, AF=%u addrlen=%zd)%s\n",
self, su_strerror(error), self, su_strerror(error),
self->tp_socket, ai->ai_family, ai->ai_addrlen, comp)); self->tp_socket, ai->ai_family, ai->ai_addrlen, comp));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment