FS-7294: Enable -Werror when building with clang compiler #resolve

diff --git a/configure.ac b/configure.ac
index 2e61464d58f40248848d6c72d7ee0237f3d79d18..e41e62d4eda3a68bfc0b09cc2c8610d140efae75 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -375,6 +375,7 @@ if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
 elif test "x${ax_cv_c_compiler_vendor}" = "xclang" ; then
     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
     APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)
+    APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
 elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
     APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)

diff --git a/libs/libdingaling/src/sha1.c b/libs/libdingaling/src/sha1.c
index c54154a866b15f7030fd38888d456d558e8b1940..b96446c1220e257eedb35a77a6467cfa78d9428b 100644 (file)
--- a/libs/libdingaling/src/sha1.c
+++ b/libs/libdingaling/src/sha1.c
@@ -57,11 +57,20 @@
 
 #include "sha1.h"
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-const-variable"
+#endif
+
 #ifndef lint
 static const char rcsid[] =
        "$Id: sha1.c 680 2003-07-25 21:57:38Z asaddi $";
 #endif /* !lint */
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 #define ROTL(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
 #define ROTR(x, n) (((x) >> (n)) | ((x) << (32 - (n))))
 

diff --git a/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c b/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
index 87216c6b5ad060a348c646442fd4927bec1e59d6..0e192acd0c730e5097ad7c7ca0ce0fd7edc39aef 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
+++ b/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
@@ -732,10 +732,19 @@ int soa_sdp_upgrade(soa_session_t *ss,
   if (session == NULL || user == NULL)
     return (errno = EFAULT), -1;
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-literal-null-conversion"
+#endif
+
   Ns = sdp_media_count(session, sdp_media_any, (sdp_text_t)0, (sdp_proto_e)0, (sdp_text_t)0);
   Nu = sdp_media_count(user, sdp_media_any, (sdp_text_t)0, (sdp_proto_e)0, (sdp_text_t)0);
   Nr = sdp_media_count(remote, sdp_media_any, (sdp_text_t)0, (sdp_proto_e)0, (sdp_text_t)0);
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
   if (remote == NULL)
     Nmax = Ns + Nu;
   else if (Ns < Nr)
@@ -1144,6 +1153,11 @@ static int offer_answer_step(soa_session_t *ss,
   else if (remote == NULL)
     return soa_set_status(ss, 500, "No remote SDP");
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-literal-null-conversion"
+#endif
+
   /* Pre-negotiation Step: Expand truncated remote SDP */
   if (local && remote) switch (action) {
   case generate_answer:
@@ -1160,6 +1174,11 @@ static int offer_answer_step(soa_session_t *ss,
     break;
   }
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+
   /* Step A: Create local SDP session (based on user-supplied SDP) */
   if (local == NULL) switch (action) {
   case generate_offer:

diff --git a/src/mod/applications/mod_voicemail_ivr/config.c b/src/mod/applications/mod_voicemail_ivr/config.c
index b0cf5434113483406d628a56a3535065b86640c4..b2b7d401161e48fe8abd7a5f9be23b1418bd5f6c 100644 (file)
--- a/src/mod/applications/mod_voicemail_ivr/config.c
+++ b/src/mod/applications/mod_voicemail_ivr/config.c
@@ -169,7 +169,7 @@ static void populate_dtmfa_from_event(vmivr_menu_t *menu) {
                        }
                }
        }
-       menu->dtmfa[i++] = '\0';
+       menu->dtmfa[i++] = NULL;
 }
 
 vmivr_profile_t *get_profile(switch_core_session_t *session, const char *profile_name)

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 1eafbe438448a4d4ec60519061c931d8063dfa48..b97a1c980480f841f3d4dd16eeccc4b13f66b9ad 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -299,15 +299,15 @@ static void extract_vars(sofia_profile_t *profile, sip_t const *sip,
        switch_channel_t *channel = switch_core_session_get_channel(session);
 
        if (sip) {
-               if (sip->sip_from && sip->sip_from->a_url)
+               if (sip->sip_from)
                        url_set_chanvars(session, sip->sip_from->a_url, sip_from);
-               if (sip->sip_request && sip->sip_request->rq_url)
+               if (sip->sip_request)
                        url_set_chanvars(session, sip->sip_request->rq_url, sip_req);
-               if (sip->sip_to && sip->sip_to->a_url)
+               if (sip->sip_to)
                        url_set_chanvars(session, sip->sip_to->a_url, sip_to);
-               if (sip->sip_contact && sip->sip_contact->m_url)
+               if (sip->sip_contact)
                        url_set_chanvars(session, sip->sip_contact->m_url, sip_contact);
-               if (sip->sip_referred_by && sip->sip_referred_by->b_url)
+               if (sip->sip_referred_by)
                        url_set_chanvars(session, sip->sip_referred_by->b_url, sip_referred_by);
                if (sip->sip_to && sip->sip_to->a_tag) {
                        switch_channel_set_variable(channel, "sip_to_tag", sip->sip_to->a_tag);
@@ -585,7 +585,7 @@ void sofia_handle_sip_i_notify(switch_core_session_t *session, int status,
                switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "event-package", sip->sip_event->o_type);
                switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "event-id", sip->sip_event->o_id);
 
-               if (sip->sip_contact && sip->sip_contact->m_url) {
+               if (sip->sip_contact) {
                        switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "contact", "%s@%s",
                                                                        sip->sip_contact->m_url->url_user, sip->sip_contact->m_url->url_host);
                }
@@ -748,7 +748,7 @@ void sofia_handle_sip_i_notify(switch_core_session_t *session, int status,
                        int acl_ok = 1;
                        char *last_acl = NULL;
 
-                       if (sip->sip_to && sip->sip_to->a_url && sip->sip_to->a_url->url_user && sip->sip_to->a_url->url_host
+                       if (sip->sip_to && sip->sip_to->a_url->url_user && sip->sip_to->a_url->url_host
                                && sip->sip_payload && sip->sip_payload->pl_data ) {
 
                                sofia_glue_get_addr(de->data->e_msg, network_ip, sizeof(network_ip), NULL);
@@ -1137,7 +1137,7 @@ void sofia_update_callee_id(switch_core_session_t *session, sofia_profile_t *pro
 
        if (!fs) {
                if ((passerted = sip_p_asserted_identity(sip))) {
-                       if (passerted->paid_url && passerted->paid_url->url_user) {
+                       if (passerted->paid_url->url_user) {
                                number = passerted->paid_url->url_user;
                        }
                        if (!zstr(passerted->paid_display)) {
@@ -1574,14 +1574,12 @@ static void our_sofia_event_callback(nua_event_t event,
                        if (sip->sip_referred_by) {
                                referred_by = sofia_glue_get_url_from_contact(sip_header_as_string(nua_handle_home(nh), (void *) sip->sip_referred_by), 0);
                                ref_by_user = sip->sip_referred_by->b_url->url_user;
-                       }
-                       else if(sip->sip_to && sip->sip_to->a_url)
-                       {
+                       } else if(sip->sip_to){
                                referred_by = sofia_glue_get_url_from_contact(sip_header_as_string(nua_handle_home(nh), (void *) sip->sip_to), 0);
                                ref_by_user = sip->sip_to->a_url->url_user;
                        }
 
-                       if (sip->sip_to && sip->sip_to->a_url) {
+                       if (sip->sip_to) {
                                req_user = sip->sip_to->a_url->url_user;
                                req_host = sip->sip_to->a_url->url_host;
                        }
@@ -2050,7 +2048,7 @@ void sofia_event_callback(nua_event_t event,
 
        switch(event) {
        case nua_i_terminated:
-               if ((status == 401 || status == 407 || status == 403) && sofia_private && sofia_private->uuid) {
+               if ((status == 401 || status == 407 || status == 403) && sofia_private) {
                        switch_core_session_t *session;
 
                        if ((session = switch_core_session_locate(sofia_private->uuid))) {
@@ -2219,7 +2217,7 @@ void sofia_event_callback(nua_event_t event,
                        if (sip->sip_from) {
                                channel_name = url_set_chanvars(session, sip->sip_from->a_url, sip_from);
                        }
-                       if (!channel_name && sip->sip_contact && sip->sip_contact->m_url) {
+                       if (!channel_name && sip->sip_contact) {
                                channel_name = url_set_chanvars(session, sip->sip_contact->m_url, sip_contact);
                        }
                        if (sip->sip_referred_by) {
@@ -5896,8 +5894,8 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
                                }
 
                                if (sip &&
-                                       sip->sip_from && sip->sip_from->a_url && sip->sip_from->a_url->url_user && sip->sip_from->a_url->url_host &&
-                                       sip->sip_to && sip->sip_to->a_url && sip->sip_to->a_url->url_user && sip->sip_to->a_url->url_host) {
+                                       sip->sip_from && sip->sip_from->a_url->url_user && sip->sip_from->a_url->url_host &&
+                                       sip->sip_to && sip->sip_to->a_url->url_user && sip->sip_to->a_url->url_host) {
                                        sql =
                                                switch_mprintf("select 'appearance-index=1' from sip_subscriptions where expires > -1 and hostname='%q' and event='call-info' and "
                                                                           "sub_to_user='%q' and sub_to_host='%q'", mod_sofia_globals.hostname, sip->sip_to->a_url->url_user,
@@ -6046,41 +6044,39 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
                                        }
 
                                        for (p_contact = sip->sip_contact; p_contact; p_contact = p_contact->m_next) {
-                                               if (p_contact->m_url) {
-                                                       full_contact = sip_header_as_string(home, (void *) p_contact);
-                                                       invite_contact = sofia_glue_strip_uri(full_contact);
-
-                                                       switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_%d", i);
-                                                       switch_channel_set_variable(a_channel, var_name, full_contact);
+                                               full_contact = sip_header_as_string(home, (void *) p_contact);
+                                               invite_contact = sofia_glue_strip_uri(full_contact);
 
-                                                       if (i == 0) {
-                                                               switch_channel_set_variable(channel, "sip_redirected_to", full_contact);
-                                                               switch_channel_set_variable(a_channel, "sip_redirected_to", full_contact);
-                                                       }
+                                               switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_%d", i);
+                                               switch_channel_set_variable(a_channel, var_name, full_contact);
 
-                                                       if (p_contact->m_url->url_user) {
-                                                               switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_user_%d", i);
-                                                               switch_channel_set_variable(channel, var_name, p_contact->m_url->url_user);
-                                                               switch_channel_set_variable(a_channel, var_name, p_contact->m_url->url_user);
-                                                       }
-                                                       if (p_contact->m_url->url_host) {
-                                                               switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_host_%d", i);
-                                                               switch_channel_set_variable(channel, var_name, p_contact->m_url->url_host);
-                                                               switch_channel_set_variable(a_channel, var_name, p_contact->m_url->url_host);
-                                                       }
-                                                       if (p_contact->m_url->url_params) {
-                                                               switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_params_%d", i);
-                                                               switch_channel_set_variable(channel, var_name, p_contact->m_url->url_params);
-                                                               switch_channel_set_variable(a_channel, var_name, p_contact->m_url->url_params);
-                                                       }
+                                               if (i == 0) {
+                                                       switch_channel_set_variable(channel, "sip_redirected_to", full_contact);
+                                                       switch_channel_set_variable(a_channel, "sip_redirected_to", full_contact);
+                                               }
 
-                                                       switch_snprintf(var_name, sizeof(var_name), "sip_redirect_dialstring_%d", i);
-                                                       switch_channel_set_variable_printf(channel, var_name, "sofia/%s/%s", sip_redirect_profile, invite_contact);
-                                                       switch_channel_set_variable_printf(a_channel, var_name, "sofia/%s/%s", sip_redirect_profile, invite_contact);
-                                                       stream.write_function(&stream, "%ssofia/%s/%s", i ? separator : "", sip_redirect_profile, invite_contact);
-                                                       free(invite_contact);
-                                                       i++;
+                                               if (p_contact->m_url->url_user) {
+                                                       switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_user_%d", i);
+                                                       switch_channel_set_variable(channel, var_name, p_contact->m_url->url_user);
+                                                       switch_channel_set_variable(a_channel, var_name, p_contact->m_url->url_user);
                                                }
+                                               if (p_contact->m_url->url_host) {
+                                                       switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_host_%d", i);
+                                                       switch_channel_set_variable(channel, var_name, p_contact->m_url->url_host);
+                                                       switch_channel_set_variable(a_channel, var_name, p_contact->m_url->url_host);
+                                               }
+                                               if (p_contact->m_url->url_params) {
+                                                       switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_params_%d", i);
+                                                       switch_channel_set_variable(channel, var_name, p_contact->m_url->url_params);
+                                                       switch_channel_set_variable(a_channel, var_name, p_contact->m_url->url_params);
+                                               }
+
+                                               switch_snprintf(var_name, sizeof(var_name), "sip_redirect_dialstring_%d", i);
+                                               switch_channel_set_variable_printf(channel, var_name, "sofia/%s/%s", sip_redirect_profile, invite_contact);
+                                               switch_channel_set_variable_printf(a_channel, var_name, "sofia/%s/%s", sip_redirect_profile, invite_contact);
+                                               stream.write_function(&stream, "%ssofia/%s/%s", i ? separator : "", sip_redirect_profile, invite_contact);
+                                               free(invite_contact);
+                                               i++;
                                        }
 
                                        redirect_dialstring = stream.data;
@@ -7795,7 +7791,7 @@ void sofia_handle_sip_i_refer(nua_t *nua, sofia_profile_t *profile, nua_handle_t
                switch_channel_set_variable(tech_pvt->channel, "transfer_disposition", "recv_replace");
 
 
-               if (refer_to->r_url &&  refer_to->r_url->url_headers) {
+               if (refer_to->r_url->url_headers) {
                        rep = (char *) switch_stristr("Replaces=", refer_to->r_url->url_headers);
                }
 
@@ -8118,7 +8114,7 @@ void sofia_handle_sip_i_refer(nua_t *nua, sofia_profile_t *profile, nua_handle_t
                                                        const char *port = NULL;
                                                        const char *rep_h = NULL;
 
-                                                       if (refer_to && refer_to->r_url && refer_to->r_url->url_port) {
+                                                       if (refer_to && refer_to->r_url->url_port) {
                                                                port = refer_to->r_url->url_port;
                                                        }
 
@@ -8132,7 +8128,7 @@ void sofia_handle_sip_i_refer(nua_t *nua, sofia_profile_t *profile, nua_handle_t
                                                        nightmare_xfer_helper = switch_core_alloc(npool, sizeof(*nightmare_xfer_helper));
                                                        nightmare_xfer_helper->exten = switch_core_strdup(npool, exten);
 
-                                                       if (refer_to->r_url && (refer_to->r_url->url_params || refer_to->r_url->url_headers)) {
+                                                       if (refer_to->r_url->url_params || refer_to->r_url->url_headers) {
                                                                if (refer_to->r_url->url_headers) {
                                                                        nightmare_xfer_helper->exten_with_params = switch_core_sprintf(npool,
                                                                                                                                                                                                   "{sip_invite_params=%s?%s}%s",
@@ -8153,7 +8149,7 @@ void sofia_handle_sip_i_refer(nua_t *nua, sofia_profile_t *profile, nua_handle_t
                                                        nightmare_xfer_helper->bridge_to_uuid = switch_core_strdup(npool, br_a);
                                                        nightmare_xfer_helper->pool = npool;
 
-                                                       if (refer_to->r_url && refer_to->r_url->url_headers) {
+                                                       if (refer_to->r_url->url_headers) {
                                                                char *h, *v, *hp;
                                                                p = switch_core_session_strdup(session, refer_to->r_url->url_headers);
                                                                while (p && *p) {
@@ -8323,7 +8319,7 @@ static switch_status_t create_info_event(sip_t const *sip,
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-Content-Type", sip->sip_content_type->c_type);
        }
 
-       if (sip->sip_from && sip->sip_from->a_url) {
+       if (sip->sip_from) {
                if (sip->sip_from->a_url->url_user) {
                        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-From-User", sip->sip_from->a_url->url_user);
                }
@@ -8333,7 +8329,7 @@ static switch_status_t create_info_event(sip_t const *sip,
                }
        }
 
-       if (sip->sip_to && sip->sip_to->a_url) {
+       if (sip->sip_to) {
                if (sip->sip_to->a_url->url_user) {
                        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-To-User", sip->sip_to->a_url->url_user);
                }
@@ -8344,7 +8340,7 @@ static switch_status_t create_info_event(sip_t const *sip,
        }
 
 
-       if (sip->sip_contact && sip->sip_contact->m_url) {
+       if (sip->sip_contact) {
                if (sip->sip_contact->m_url->url_user) {
                        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-Contact-User", sip->sip_contact->m_url->url_user);
                }
@@ -8793,9 +8789,10 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
        int is_tcp = 0, is_tls = 0;
        const char *uparams = NULL;
        char *name_params = NULL;
+       const char *req_uri = NULL;
+       char *req_user = NULL;
 
-
-       if (sip && sip->sip_contact && sip->sip_contact->m_url && sip->sip_contact->m_url->url_params) {
+       if (sip && sip->sip_contact && sip->sip_contact->m_url->url_params) {
                uparams = sip->sip_contact->m_url->url_params;
        } else {
                uparams = NULL;
@@ -8829,7 +8826,7 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
                goto fail;
        }
 
-       if (!(sip->sip_contact && sip->sip_contact->m_url)) {
+       if (!(sip->sip_contact)) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO CONTACT!\n");
                nua_respond(nh, 400, "Missing Contact Header", TAG_END());
                goto fail;
@@ -8880,7 +8877,7 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
                char *last_acl = NULL;
                const char *contact_host = NULL;
 
-               if (sip && sip->sip_contact && sip->sip_contact->m_url) {
+               if (sip && sip->sip_contact) {
                        contact_host = sip->sip_contact->m_url->url_host;
                }
 
@@ -9088,7 +9085,7 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
                }
        }
 
-       if (sip->sip_via || (sip->sip_contact && sip->sip_contact->m_url)) {
+       if (sip->sip_via || sip->sip_contact) {
                char tmp[35] = "";
                const char *ipv6 = strchr(tech_pvt->mparams.remote_ip, ':');
 
@@ -9169,7 +9166,7 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
                switch_event_destroy(&v_event);
        }
 
-       if (sip->sip_from && sip->sip_from->a_url) {
+       if (sip->sip_from) {
                from_user = sip->sip_from->a_url->url_user;
                from_host = sip->sip_from->a_url->url_host;
                //channel_name = url_set_chanvars(session, sip->sip_from->a_url, sip_from);
@@ -9204,7 +9201,7 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
        }
 
        if ((rpid = sip_remote_party_id(sip))) {
-               if (rpid->rpid_url && rpid->rpid_url->url_user) {
+               if (rpid->rpid_url->url_user) {
                        char *full_rpid_header = sip_header_as_string(nh->nh_home, (void *) rpid);
                        from_user = rpid->rpid_url->url_user;
                        if (!zstr(full_rpid_header)) {
@@ -9220,7 +9217,7 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
        }
 
        if ((passerted = sip_p_asserted_identity(sip))) {
-               if (passerted->paid_url && passerted->paid_url->url_user) {
+               if (passerted->paid_url->url_user) {
                        char *full_paid_header = sip_header_as_string(nh->nh_home, (void *) passerted);
                        //char *full_paid_header = (char *)(passerted->paid_common->h_data);
                        from_user = passerted->paid_url->url_user;
@@ -9243,7 +9240,7 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
        }
 
        if ((ppreferred = sip_p_preferred_identity(sip))) {
-               if (ppreferred->ppid_url && ppreferred->ppid_url->url_user) {
+               if (ppreferred->ppid_url->url_user) {
                        char *full_ppid_header = sip_header_as_string(nh->nh_home, (void *) ppreferred);
                        from_user = ppreferred->ppid_url->url_user;
                        if (!zstr(full_ppid_header)) {
@@ -9269,58 +9266,55 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
 
        extract_header_vars(profile, sip, session, nh);
 
-       if (sip->sip_request->rq_url) {
-               const char *req_uri = url_set_chanvars(session, sip->sip_request->rq_url, sip_req);
-               char *user = NULL;
-               if (sip->sip_request->rq_url->url_user) {
-
-                       user = switch_core_session_strdup(session, sip->sip_request->rq_url->url_user);
-                       if (profile->parse_invite_tel_params) {
-                               if (strchr(user, ';')) {
-                                       int argc1, x1 = 0;
-                                       char *argv1[32] = { 0 };
-
-                                       if ((argc1 = switch_separate_string(user, ';', argv1, (sizeof(argv1) / sizeof(argv1[0]))))) {
-                                               for (x1 = 0; x1 < argc1; x1++) {
-                                                       if (x1 == 0) {
-                                                               switch_channel_set_variable(channel, "sip_req_user", argv1[0]);
+       req_uri = url_set_chanvars(session, sip->sip_request->rq_url, sip_req);
+       if (sip->sip_request->rq_url->url_user) {
+
+               req_user = switch_core_session_strdup(session, sip->sip_request->rq_url->url_user);
+               if (profile->parse_invite_tel_params) {
+                       if (strchr(req_user, ';')) {
+                               int argc1, x1 = 0;
+                               char *argv1[32] = { 0 };
+
+                               if ((argc1 = switch_separate_string(req_user, ';', argv1, (sizeof(argv1) / sizeof(argv1[0]))))) {
+                                       for (x1 = 0; x1 < argc1; x1++) {
+                                               if (x1 == 0) {
+                                                       switch_channel_set_variable(channel, "sip_req_user", argv1[0]);
+                                               } else {
+                                                       int argc2 = 0;
+                                                       char *argv2[2] = { 0 };
+                                                       if ((argc2 = switch_separate_string(argv1[x1], '=', argv2, (sizeof(argv2) / sizeof(argv2[0])))) == 2) {
+                                                               char *var_name = NULL;
+                                                               var_name = switch_mprintf("sip_invite_%s", argv2[0]);
+                                                               switch_channel_set_variable(channel, var_name, argv2[1]);
+                                                               switch_safe_free( var_name );
                                                        } else {
-                                                               int argc2 = 0;
-                                                               char *argv2[2] = { 0 };
-                                                               if ((argc2 = switch_separate_string(argv1[x1], '=', argv2, (sizeof(argv2) / sizeof(argv2[0])))) == 2) {
-                                                                       char *var_name = NULL;
-                                                                       var_name = switch_mprintf("sip_invite_%s", argv2[0]);
-                                                                       switch_channel_set_variable(channel, var_name, argv2[1]);
-                                                                       switch_safe_free( var_name );
-                                                               } else {
-                                                                       char *var_name = NULL;
-                                                                       var_name = switch_mprintf("sip_invite_%s", argv1[x1]);
-                                                                       switch_channel_set_variable(channel, var_name, "true");
-                                                                       switch_safe_free( var_name );                                                                   
-                                                               }
+                                                               char *var_name = NULL;
+                                                               var_name = switch_mprintf("sip_invite_%s", argv1[x1]);
+                                                               switch_channel_set_variable(channel, var_name, "true");
+                                                               switch_safe_free( var_name );                                                                   
                                                        }
                                                }
                                        }
                                }
                        }
                }
+       }
 
-               if (sofia_test_pflag(profile, PFLAG_FULL_ID)) {
-                       destination_number = req_uri;
-               } else {
-                       destination_number = user;
-               }
-               if (sip->sip_request->rq_url->url_params && (sofia_glue_find_parameter(sip->sip_request->rq_url->url_params, "intercom=true"))) {
-                       switch_channel_set_variable(channel, "sip_auto_answer_detected", "true");
-               }
+       if (sofia_test_pflag(profile, PFLAG_FULL_ID)) {
+               destination_number = req_uri;
+       } else {
+               destination_number = req_user;
+       }
+       if (sip->sip_request->rq_url->url_params && (sofia_glue_find_parameter(sip->sip_request->rq_url->url_params, "intercom=true"))) {
+               switch_channel_set_variable(channel, "sip_auto_answer_detected", "true");
        }
 
-       if (!destination_number && sip->sip_to && sip->sip_to->a_url) {
+       if (!destination_number && sip->sip_to) {
                destination_number = sip->sip_to->a_url->url_user;
        }
 
        /* The human network, OH THE HUMANITY!!! lets send invites with no number! */
-       if (!destination_number && sip->sip_from && sip->sip_from->a_url) {
+       if (!destination_number && sip->sip_from) {
                destination_number = sip->sip_from->a_url->url_user;
        }
 
@@ -9330,12 +9324,12 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
                destination_number = "service";
        }
 
-       if (sip->sip_to && sip->sip_to->a_url) {
+       if (sip->sip_to) {
                const char *host, *user;
                int port, check_nat = 0;
                url_t *transport_url;
 
-               if (sip->sip_record_route && sip->sip_record_route->r_url) {
+               if (sip->sip_record_route) {
                        transport_url = sip->sip_record_route->r_url;
                } else {
                        transport_url = sip->sip_contact->m_url;
@@ -9437,7 +9431,7 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
                nua_set_hparams(tech_pvt->nh, SIPTAG_VIA_STR(tech_pvt->user_via), TAG_END());
        }
 
-       if (sip->sip_contact && sip->sip_contact->m_url) {
+       if (sip->sip_contact) {
                url_set_chanvars(session, sip->sip_contact->m_url, sip_contact);
        }
 
@@ -9581,8 +9575,8 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
                char *state = "progressing";
 
                if (sip &&
-                       sip->sip_from && sip->sip_from->a_url && sip->sip_from->a_url->url_user && sip->sip_from->a_url->url_host &&
-                       sip->sip_to && sip->sip_to->a_url && sip->sip_to->a_url->url_user && sip->sip_to->a_url->url_host) {
+                       sip->sip_from && sip->sip_from->a_url->url_user && sip->sip_from->a_url->url_host &&
+                       sip->sip_to && sip->sip_to->a_url->url_user && sip->sip_to->a_url->url_host) {
                        sql =
                                switch_mprintf("select 'appearance-index=1' from sip_subscriptions where expires > -1 and hostname='%q' and event='call-info' and "
                                                           "sub_to_user='%q' and sub_to_host='%q'", mod_sofia_globals.hostname, sip->sip_to->a_url->url_user,
@@ -9700,12 +9694,12 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
                char *p = NULL;
                const char *user = NULL, *host = NULL, *from_user = NULL, *from_host = NULL;
 
-               if (sip->sip_to && sip->sip_to->a_url) {
+               if (sip->sip_to) {
                        user = sip->sip_to->a_url->url_user;
                        host = sip->sip_to->a_url->url_host;
                }
 
-               if (sip->sip_from && sip->sip_from->a_url) {
+               if (sip->sip_from) {
                        from_user = sip->sip_from->a_url->url_user;
                        from_host = sip->sip_from->a_url->url_host;
                }

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index c26c66740d986dbb374993c883fb027ac9f8786b..74d4395113801d4ee92dee3c9241de18c28c9db4 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -2852,7 +2852,7 @@ char *sofia_glue_gen_contact_str(sofia_profile_t *profile, sip_t const *sip, nua
        const char *ipv6;
        sip_from_t const *from;
 
-       if (!sip || !sip->sip_contact || !sip->sip_contact->m_url) {
+       if (!sip || !sip->sip_contact) {
                return NULL;
        }
 
@@ -2933,7 +2933,7 @@ char *sofia_glue_gen_contact_str(sofia_profile_t *profile, sip_t const *sip, nua
                np->is_nat = NULL;
        }
 
-       if (sip->sip_record_route && sip->sip_record_route->r_url) {
+       if (sip->sip_record_route) {
                char *full_contact = sip_header_as_string(nh->nh_home, (void *) contact);
                char *route = sofia_glue_strip_uri(sip_header_as_string(nh->nh_home, (void *) sip->sip_record_route));
                char *full_contact_dup;

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index 5520e6ec7618efea1e0079910a929e41aa9da3f4..7e31b4cfdde72f83cc8e9efefc016890be27a3fd 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -3704,7 +3704,7 @@ void sofia_presence_handle_sip_i_subscribe(int status,
                use_to_tag = to_tag;
        }
 
-       if ( sip->sip_contact && sip->sip_contact->m_url ) {
+       if (sip->sip_contact) {
                contact_host = sip->sip_contact->m_url->url_host;
                contact_port = sip->sip_contact->m_url->url_port;
                contact_user = sip->sip_contact->m_url->url_user;
@@ -4062,7 +4062,7 @@ void sofia_presence_handle_sip_i_subscribe(int status,
                }
 
 
-               if (nh && nh->nh_ds && nh->nh_ds->ds_usage) {
+               if (nh && nh->nh_ds->ds_usage) {
                        /* nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, exp_delta + SUB_OVERLAP, exp_delta + SUB_OVERLAP); */
                        nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, exp_delta, exp_delta);
                }
@@ -5029,8 +5029,7 @@ void sofia_presence_set_chat_hash(private_object_t *tech_pvt, sip_t const *sip)
        char buf[512];
        su_home_t *home = NULL;
 
-       if (!tech_pvt || tech_pvt->hash_key || !sip || !sip->sip_from || !sip->sip_from->a_url ||
-               !sip->sip_from->a_url->url_user || !sip->sip_from->a_url->url_host) {
+       if (!tech_pvt || tech_pvt->hash_key || !sip || !sip->sip_from || !sip->sip_from->a_url->url_user || !sip->sip_from->a_url->url_host) {
                return;
        }
 

diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c
index dad7c09a36f92d7828094a37bc08129eb22fd0ce..3212531a1ee81fe4af3312cc34211ec3c34c0e05 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_reg.c
+++ b/src/mod/endpoints/mod_sofia/sofia_reg.c
@@ -1269,7 +1269,7 @@ uint8_t sofia_reg_handle_register_token(nua_t *nua, sofia_profile_t *profile, nu
                sofia_private = *sofia_private_p;
        }
 
-       if (sip && sip->sip_contact && sip->sip_contact->m_url && sip->sip_contact->m_url->url_params) {
+       if (sip && sip->sip_contact && sip->sip_contact->m_url->url_params) {
                uparams = sip->sip_contact->m_url->url_params;
        } else {
                uparams = NULL;
@@ -2189,7 +2189,7 @@ void sofia_reg_handle_sip_i_register(nua_t *nua, sofia_profile_t *profile, nua_h
        sofia_glue_get_addr(de->data->e_msg, network_ip, sizeof(network_ip), &network_port);
 
        /* backwards compatibility */
-       if (mod_sofia_globals.reg_deny_binding_fetch_and_no_lookup && !(sip->sip_contact && sip->sip_contact->m_url)) {
+       if (mod_sofia_globals.reg_deny_binding_fetch_and_no_lookup && !sip->sip_contact) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO CONTACT! ip: %s, port: %i\n", network_ip, network_port);
                nua_respond(nh, 400, "Missing Contact Header", TAG_END());
                goto end;
@@ -2226,7 +2226,7 @@ void sofia_reg_handle_sip_i_register(nua_t *nua, sofia_profile_t *profile, nua_h
                char *last_acl = NULL;
                const char *contact_host = NULL;
 
-               if (sip && sip->sip_contact && sip->sip_contact->m_url) {
+               if (sip && sip->sip_contact) {
                        contact_host = sip->sip_contact->m_url->url_host;
                }
 
@@ -2492,7 +2492,7 @@ void sofia_reg_handle_sip_r_challenge(int status,
                }
        }
 
-       if (!gateway && !sip_auth_username && sip && sip->sip_to && sip->sip_to->a_url && sip->sip_to->a_url->url_user && sip->sip_to->a_url->url_host) {
+       if (!gateway && !sip_auth_username && sip && sip->sip_to && sip->sip_to->a_url->url_user && sip->sip_to->a_url->url_host) {
                switch_xml_t x_user, x_param, x_params;
                switch_event_t *locate_params;
 

diff --git a/src/mod/formats/mod_shout/mod_shout.c b/src/mod/formats/mod_shout/mod_shout.c
index 773e937912bf3908173be8c618c92590a61bed37..b384d1a8a42bbcd86e8987b37aa612f858843f82 100644 (file)
--- a/src/mod/formats/mod_shout/mod_shout.c
+++ b/src/mod/formats/mod_shout/mod_shout.c
@@ -181,9 +181,6 @@ static inline void free_context(shout_context_t *context)
 
                        while ((len = lame_encode_flush(context->gfp, mp3buffer, sizeof(mp3buffer))) > 0) {
                                ret = fwrite(mp3buffer, 1, len, context->fp);
-                               if (ret < 0) {
-                                       break;
-                               }
                        }
 
                        lame_mp3_tags_fid(context->gfp, context->fp);
@@ -899,7 +896,8 @@ static switch_status_t shout_file_close(switch_file_handle_t *handle)
 static switch_status_t shout_file_seek(switch_file_handle_t *handle, unsigned int *cur_sample, int64_t samples, int whence)
 {
        shout_context_t *context = handle->private_info;
-       
+       off_t seek_samples;
+
        if (handle->handler || switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) {
                return SWITCH_STATUS_FALSE;
        } else {
@@ -908,10 +906,10 @@ static switch_status_t shout_file_seek(switch_file_handle_t *handle, unsigned in
                }
 
                switch_buffer_zero(context->audio_buffer);
-               *cur_sample = mpg123_seek(context->mh, (off_t) samples, whence);
+               seek_samples = mpg123_seek(context->mh, (off_t) samples, whence);
 
-               if (*cur_sample >= 0) {
-                       handle->pos = *cur_sample;
+               if (seek_samples >= 0) {
+                       handle->pos = *cur_sample = seek_samples;
                        return SWITCH_STATUS_SUCCESS;
                }
 

diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c
index 2bb5bb466a011b4b7d3db16dcbc866e8fae4f924..eda1d6ef01a75ed7609f54b66947572cd99a1878 100644 (file)
--- a/src/switch_ivr_play_say.c
+++ b/src/switch_ivr_play_say.c
@@ -2463,12 +2463,10 @@ SWITCH_DECLARE(void) switch_ivr_clear_speech_cache(switch_core_session_t *sessio
                if (cache_obj->timer.interval) {
                        switch_core_timer_destroy(&cache_obj->timer);
                }
-               if (&cache_obj->sh && cache_obj->sh.speech_interface) {
+               if (cache_obj->sh.speech_interface) {
                        switch_core_speech_close(&cache_obj->sh, &flags);
                }
-               if (&cache_obj->codec) {
-                       switch_core_codec_destroy(&cache_obj->codec);
-               }
+               switch_core_codec_destroy(&cache_obj->codec);
                switch_channel_set_private(channel, SWITCH_CACHE_SPEECH_HANDLES_OBJ_NAME, NULL);
        }
 }

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 4ad259cce373bf8afccac3e4ae87854cf99282bb..91905df22f823b3ef74a531c6306a89411526839 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -2010,14 +2010,14 @@ static int rtcp_stats(switch_rtp_t *rtp_session)
                  stats->period_pkt_count, pkt_seq, stats->cycle, stats->ssrc, rtp_session->timer.samplecount);
 #endif
        /* Interarrival jitter calculation */
-       pkt_tsdiff = rtp_session->timer.samplecount - ntohl(hdr->ts) ;  /* relative transit times for this packet */
+       pkt_tsdiff = abs((int)rtp_session->timer.samplecount - (int)ntohl(hdr->ts));  /* relative transit times for this packet */
        if (stats->pkt_count < 2) { /* Can not compute Jitter with only one packet */
                stats->last_pkt_tsdiff = pkt_tsdiff;
        } else {
-               packet_spacing_diff = pkt_tsdiff - stats->last_pkt_tsdiff;    /* Jitter : difference of relative transit times for the two packets */
+               packet_spacing_diff = abs((int)pkt_tsdiff - (int)stats->last_pkt_tsdiff);    /* Jitter : difference of relative transit times for the two packets */
                stats->last_pkt_tsdiff = pkt_tsdiff;
                /* Interarrival jitter estimation, "J(i) = J(i-1) + ( |D(i-1,i)| - J(i-1) )/16" */
-               stats->inter_jitter = (stats->inter_jitter + (((double)abs(packet_spacing_diff) - stats->inter_jitter) /16.));
+               stats->inter_jitter = (stats->inter_jitter + (((double)packet_spacing_diff - stats->inter_jitter) /16.));
        }
 
 #ifdef DEBUG_RTCP