Changeset 304:bc8e4448b637 in verona

Timestamp:

Sep 14, 2011 4:36:30 PM (20 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Message:

exosip COVERITY fixes NO CSL

File:

• libeXosip2/src/eXconf.c (modified) (11 diffs)

libeXosip2/src/eXconf.c

@@ -72 +72 @@
         eXtl_dtls.tl_masquerade_contact(public_address, port);
 #endif
+#endif
+#ifdef HAVE_CSL
+        eXtl_csl.tl_masquerade_contact(public_address, port);
+        eXtl_dcsl.tl_masquerade_contact(public_address, port);
 #endif
         return;
@@ -269 +273 @@
         eXtl_tls.tl_free();
 #endif
+#ifdef HAVE_CSL
+        eXtl_csl.tl_free();
+        eXtl_dcsl.tl_free();
+#endif
 
         memset(&eXosip, 0, sizeof(eXosip));
@@ -551 +559 @@
         else if (transport == IPPROTO_TCP && secure == 0)
                 eXtl = &eXtl_tcp;
+#ifdef HAVE_CSL
+        else if (transport == IPPROTO_UDP)
+                eXtl = &eXtl_dcsl;
+        else if (transport == IPPROTO_TCP)
+                eXtl = &eXtl_csl;
+#endif
 #ifdef HAVE_OPENSSL_SSL_H
 #if !(OPENSSL_VERSION_NUMBER < 0x00908000L)
@@ -587 +601 @@
         //FIXME: ce n'est peut être pas la meilleur maniÚre de la faire car du coup on ne peut pas avoir openssl et csl en meme temps
         //utiliser secure == 1 pour openssl et secure == pour CSL
+#ifndef HAVE_CSL /* !HAVE_CSL */
         else if (transport == IPPROTO_UDP)
                 snprintf(eXosip.transport, sizeof(eXosip.transport), "%s", "DTLS-UDP");
         else if (transport == IPPROTO_TCP)
                 snprintf(eXosip.transport, sizeof(eXosip.transport), "%s", "TLS");
+#else /* HAVE_CSL */
+        else if (transport == IPPROTO_UDP)
+                snprintf(eXosip.transport, sizeof(eXosip.transport), "%s", "DCSL");
+        else if (transport == IPPROTO_TCP)
+                snprintf(eXosip.transport, sizeof(eXosip.transport), "%s", "CSL");
+#endif /* HAVE_CSL */
 
 #ifdef OSIP_MT
@@ -714 +735 @@
 #endif
         eXtl_tls.tl_init();
+#endif
+#ifdef HAVE_CSL
+        eXtl_csl.tl_init();
+        eXtl_dcsl.tl_init();
 #endif
         return OSIP_SUCCESS;
@@ -922 +947 @@
                 memset(eXosip.http_proxy, '\0', sizeof(eXosip.http_proxy));
                 if (tmp != NULL && tmp[0] != '\0')
-                        strncpy(eXosip.http_proxy, tmp, sizeof(eXosip.http_proxy));     /* value in proxy:port */
+                        osip_strncpy(eXosip.http_proxy, tmp, sizeof(eXosip.http_proxy)-1);      /* value in proxy:port */
                 OSIP_TRACE(osip_trace
                                    (__FILE__, __LINE__, OSIP_INFO1, NULL,
@@ -932 +957 @@
                            sizeof(eXosip.http_outbound_proxy));
                 if (tmp != NULL && tmp[0] != '\0')
-                        strncpy(eXosip.http_outbound_proxy, tmp, sizeof(eXosip.http_outbound_proxy));   /* value in proxy:port */
+                        osip_strncpy(eXosip.http_outbound_proxy, tmp, sizeof(eXosip.http_outbound_proxy)-1);    /* value in proxy:port */
                 OSIP_TRACE(osip_trace
                                    (__FILE__, __LINE__, OSIP_INFO1, NULL,
@@ -954 +979 @@
                 memset(eXosip.ipv4_for_gateway, '\0', sizeof(eXosip.ipv4_for_gateway));
                 if (tmp != NULL && tmp[0] != '\0')
-                        strncpy(eXosip.ipv4_for_gateway, tmp, sizeof(eXosip.ipv4_for_gateway));
+                        osip_strncpy(eXosip.ipv4_for_gateway, tmp, sizeof(eXosip.ipv4_for_gateway)-1);
                 OSIP_TRACE(osip_trace
                                    (__FILE__, __LINE__, OSIP_INFO1, NULL,
@@ -965 +990 @@
                 memset(eXosip.ipv6_for_gateway, '\0', sizeof(eXosip.ipv6_for_gateway));
                 if (tmp != NULL && tmp[0] != '\0')
-                        strncpy(eXosip.ipv6_for_gateway, tmp, sizeof(eXosip.ipv6_for_gateway));
+                        osip_strncpy(eXosip.ipv6_for_gateway, tmp, sizeof(eXosip.ipv6_for_gateway)-1);
                 OSIP_TRACE(osip_trace
                                    (__FILE__, __LINE__, OSIP_INFO1, NULL,
@@ -975 +1000 @@
                 memset(eXosip.event_package, '\0', sizeof(eXosip.event_package));
                 if (tmp != NULL && tmp[0] != '\0')
-                        strncpy(eXosip.event_package, tmp, sizeof(eXosip.event_package));
+                        osip_strncpy(eXosip.event_package, tmp, sizeof(eXosip.event_package)-1);
                 OSIP_TRACE(osip_trace
                                    (__FILE__, __LINE__, OSIP_INFO1, NULL,
@@ -1027 +1052 @@
 #endif
 #endif
+#ifdef HAVE_CSL
+        ret += eXtl_csl.tl_keepalive();
+        ret += eXtl_dcsl.tl_keepalive();
+#endif
         if (ret < 0)
         {