From bc177a4b285b6b5d62a8976cb45702f486a57a6a Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 2 Aug 2011 13:51:57 -0500 Subject: [PATCH] FS-3475 --resolve --- libs/sofia-sip/.update | 2 +- .../libsofia-sip-ua/tport/tport_logging.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index 02a17b54a0..c2a60933c6 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Mon Aug 1 10:01:41 CDT 2011 +Tue Aug 2 13:51:40 CDT 2011 diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c b/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c index a3e7532c96..fe23ce433a 100644 --- a/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c +++ b/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c @@ -416,11 +416,15 @@ void tport_capt_msg(tport_t const *self, msg_t *msg, size_t n, buflen += sizeof(struct hep_iphdr); } #if SU_HAVE_IN6 - else { + else if(su->su_family == AF_INET6) { memcpy(buffer+buflen, &hep_ip6header, sizeof(struct hep_ip6hdr)); buflen += sizeof(struct hep_ip6hdr); } -#endif +#endif + else { + su_perror("error: tport_logging: capture: unsupported protocol family"); + goto done; + } for (i = 0; i < iovused && n > 0; i++) { size_t len = iov[i].mv_len; @@ -437,14 +441,16 @@ void tport_capt_msg(tport_t const *self, msg_t *msg, size_t n, /* check if we have error i.e. capture server is down */ if ((error = su_soerror(mr->mr_capt_sock))) { - su_perror("capture socket error"); - return; + su_perror("error: tport_logging: capture socket error"); + goto done; } su_send(mr->mr_capt_sock, buffer, buflen, 0); +done: /* Now we release it */ if(buffer) free(buffer); + return; }