kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-30 10:30:06 +00:00
Code Issues Projects Releases Wiki Activity

FS-3917 sneaky sql null vs != crap

Browse Source
This commit is contained in:
Anthony Minessale 2012-02-17 19:47:57 -06:00
parent f6941ca48f
commit 341cc2f0fc
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mod/applications/mod_spandsp/Makefile.am
View File

@ -22,3 +22,9 @@ $(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
$(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update $(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update
cd $(TIFF_BUILDDIR) && $(MAKE) -j1 cd $(TIFF_BUILDDIR) && $(MAKE) -j1
$(TOUCH_TARGET) $(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

4
src/mod/endpoints/mod_sofia/mod_sofia.c
View File

@ -4647,8 +4647,8 @@ static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session
} }
now = switch_epoch_time_now(NULL); now = switch_epoch_time_now(NULL);
sql = switch_mprintf("insert into sip_dialogs (uuid,presence_id,presence_data,profile_name,hostname,rcd) " 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), "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); 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); sofia_glue_actually_execute_sql(profile, sql, profile->ireg_mutex);
switch_safe_free(sql); switch_safe_free(sql);

10
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -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 " 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," "(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) " "contact_host,state,direction,user_agent,profile_name,hostname,contact,presence_id,presence_data,"
"values('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q',%ld)", "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, call_id,
switch_core_session_get_uuid(session), switch_core_session_get_uuid(session),
to_user, to_host, to_tag, from_user, from_host, from_tag, contact_user, 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 " 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," "(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) " "contact_host,state,direction,user_agent,profile_name,hostname,contact,presence_id,presence_data,"
"values('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q',%ld)", "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, call_id,
tech_pvt->sofia_private->uuid, tech_pvt->sofia_private->uuid,
to_user, to_host, to_tag, dialog_from_user, dialog_from_host, from_tag, to_user, to_host, to_tag, dialog_from_user, dialog_from_host, from_tag,

2
src/mod/endpoints/mod_sofia/sofia_glue.c
View File

@ -5985,7 +5985,7 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
" presence_id VARCHAR(255),\n" " presence_id VARCHAR(255),\n"
" presence_data VARCHAR(255),\n" " presence_data VARCHAR(255),\n"
" call_info 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" " expires INTEGER default 0,\n"
" status VARCHAR(255),\n" " status VARCHAR(255),\n"
" rpid VARCHAR(255),\n" " rpid VARCHAR(255),\n"