add optional call_id arg to sofia profile foo flush_inbound_reg [<call_id>]

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7965 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index c3038a7beb6c1011cfba591fc3e3bd9c2a633dae..14639f1026bee99e98b4d46b23bf7c6aaf69b9bb 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -1325,10 +1325,16 @@ static switch_status_t cmd_profile(char **argv, int argc, switch_stream_handle_t
                stream->write_function(stream, "Invalid Profile [%s]", switch_str_nil(profile_name));
                return SWITCH_STATUS_SUCCESS;
        }
-
+       
        if (!strcasecmp(argv[1], "flush_inbound_reg")) {
-               sofia_reg_check_expire(profile, 0);
-               stream->write_function(stream, "+OK\n");
+               if (argc > 2) {
+                       sofia_reg_expire_call_id(profile, argv[2]);
+                       stream->write_function(stream, "+OK flushing all registrations matching specified call_id\n");
+               } else {
+                       sofia_reg_check_expire(profile, 0);
+                       stream->write_function(stream, "+OK flushing all registrations\n");
+               }
+
                goto done;
        }
 
@@ -1542,7 +1548,7 @@ SWITCH_STANDARD_API(sofia_function)
        const char *usage_string = "USAGE:\n"
                "--------------------------------------------------------------------------------\n"
                "sofia help\n"
-               "sofia profile <profile_name> [start|stop|restart|flush_inbound_reg|[register|unregister] [<gateway name>|all]] [reloadxml]\n"
+               "sofia profile <profile_name> [start|stop|restart|flush_inbound_reg [<call_id>]|[register|unregister] [<gateway name>|all]] [reloadxml]\n"
                "sofia status [[profile | gateway] <name>]\n"
                "sofia loglevel [0-9]\n"
                "--------------------------------------------------------------------------------\n";

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h
index 9e20028c7e4ee29e308a9f3a7a6de4fe3985711b..e053181974f2a1f2d66b42bf88392d34a778da01 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@@ -602,3 +602,4 @@ switch_status_t sofia_glue_build_crypto(private_object_t *tech_pvt, int index, s
 void sofia_glue_tech_patch_sdp(private_object_t *tech_pvt);
 switch_status_t sofia_glue_tech_proxy_remote_addr(private_object_t *tech_pvt);
 void sofia_presence_event_thread_start(void);
+void sofia_reg_expire_call_id(sofia_profile_t *profile, const char *call_id);

diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c
index c030a7aed4267f3faf516b113595c1bb41c5cc25..e164526a34bddd6ac4c17895e37b9b2e7038f1c4 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_reg.c
+++ b/src/mod/endpoints/mod_sofia/sofia_reg.c
@@ -206,6 +206,24 @@ int sofia_reg_del_callback(void *pArg, int argc, char **argv, char **columnNames
        return 0;
 }
 
+void sofia_reg_expire_call_id(sofia_profile_t *profile, const char *call_id)
+{
+       char sql[1024];
+       char *psql = sql;
+       
+       switch_snprintf(sql, sizeof(sql), "select *,'%s' from sip_registrations where call_id='%s'", profile->name, call_id);
+       switch_mutex_lock(profile->ireg_mutex);
+       sofia_glue_execute_sql_callback(profile,
+                                                                       SWITCH_TRUE,
+                                                                       NULL,
+                                                                       sql,
+                                                                       sofia_reg_del_callback,
+                                                                       NULL);
+       switch_mutex_unlock(profile->ireg_mutex);
+
+       switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where call_id='%s'", call_id);
+       sofia_glue_execute_sql(profile, &psql, SWITCH_FALSE);
+}
 
 void sofia_reg_check_expire(sofia_profile_t *profile, time_t now)
 {