FS-3917 sneaky sql null vs != crap

diff --git a/src/mod/applications/mod_spandsp/Makefile.am b/src/mod/applications/mod_spandsp/Makefile.am
index 2a63c423161552a3ab6d2b3db4be6256f87eb2df..551a2b560c440158fbbf9f5ee19b196c8de11419 100644 (file)
--- a/src/mod/applications/mod_spandsp/Makefile.am
+++ b/src/mod/applications/mod_spandsp/Makefile.am
@@ -22,3 +22,9 @@ $(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
 $(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update
        cd $(TIFF_BUILDDIR) && $(MAKE) -j1
        $(TOUCH_TARGET)
+
+install-exec-local: $(DESTDIR)$(libdir)/libspandsp.la
+
+$(DESTDIR)$(libdir)/libspandsp.la: $(SPANDSP_LA)
+       cd $(TIFF_DIR) && $(MAKE) -j1 install
+       cd $(SPANDSP_DIR) && $(MAKE) -j1 install

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index a2d7a5d45c7d9f6ef17c4786c97b3bec7808aa5e..d8f548e18803f9f803fc2f6993f085acedcf416e 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -4647,8 +4647,8 @@ static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session
                }
 
                now = switch_epoch_time_now(NULL);
-               sql = switch_mprintf("insert into sip_dialogs (uuid,presence_id,presence_data,profile_name,hostname,rcd) "
-                                                        "values ('%q', '%q', '%q', '%q', '%q', %ld)", switch_core_session_get_uuid(nsession),
+               sql = switch_mprintf("insert into sip_dialogs (uuid,presence_id,presence_data,profile_name,hostname,rcd,call_info_state) "
+                                                        "values ('%q', '%q', '%q', '%q', '%q', %ld, '')", switch_core_session_get_uuid(nsession),
                                                         switch_str_nil(presence_id), switch_str_nil(presence_data), profile->name, mod_sofia_globals.hostname, (long) now);
                sofia_glue_actually_execute_sql(profile, sql, profile->ireg_mutex);
                switch_safe_free(sql);

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index cac1b43472808f0994a11ecf1ab5e4c96d5c56c1..8b362b6f33242c0d58618a4401f1f8928b871920 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -5265,8 +5265,9 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
                                        
                                        sql = switch_mprintf("insert into sip_dialogs "
                                                                                 "(call_id,uuid,sip_to_user,sip_to_host,sip_to_tag,sip_from_user,sip_from_host,sip_from_tag,contact_user,"
-                                                                                "contact_host,state,direction,user_agent,profile_name,hostname,contact,presence_id,presence_data,call_info,rcd) "
-                                                                                "values('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q',%ld)",
+                                                                                "contact_host,state,direction,user_agent,profile_name,hostname,contact,presence_id,presence_data,"
+                                                                                "call_info,rcd,call_info_state) "
+                                                                                "values('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q',%ld,'')",
                                                                                 call_id,
                                                                                 switch_core_session_get_uuid(session),
                                                                                 to_user, to_host, to_tag, from_user, from_host, from_tag, contact_user,
@@ -8446,8 +8447,9 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
 
                        sql = switch_mprintf("insert into sip_dialogs "
                                                                 "(call_id,uuid,sip_to_user,sip_to_host,sip_to_tag,sip_from_user,sip_from_host,sip_from_tag,contact_user,"
-                                                                "contact_host,state,direction,user_agent,profile_name,hostname,contact,presence_id,presence_data,call_info,rcd) "
-                                                                "values('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q',%ld)",
+                                                                "contact_host,state,direction,user_agent,profile_name,hostname,contact,presence_id,presence_data,"
+                                                                "call_info,rcd,call_info_state) "
+                                                                "values('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q',%ld,'')",
                                                                 call_id,
                                                                 tech_pvt->sofia_private->uuid,
                                                                 to_user, to_host, to_tag, dialog_from_user, dialog_from_host, from_tag,

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index 3f754462e71b3d42d3c9c1ee5ec62da1ac630a30..6ae9cef645fd4f87406519bc0884d3913d32682f 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -5985,7 +5985,7 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
                "   presence_id     VARCHAR(255),\n"
                "   presence_data   VARCHAR(255),\n"
                "   call_info       VARCHAR(255),\n"
-               "   call_info_state VARCHAR(255),\n"
+               "   call_info_state VARCHAR(255) default '',\n"
                "   expires         INTEGER default 0,\n"
                "   status          VARCHAR(255),\n"
                "   rpid            VARCHAR(255),\n"