update

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

diff --git a/src/mod/endpoints/mod_exosip/mod_exosip.c b/src/mod/endpoints/mod_exosip/mod_exosip.c
index bf8d2bbe58e4aaa7b9322cc37a2a2ac8318d82b7..b0ae6aff2dca52d903d5cabf5f84a07425c8c573 100644 (file)
--- a/src/mod/endpoints/mod_exosip/mod_exosip.c
+++ b/src/mod/endpoints/mod_exosip/mod_exosip.c
@@ -30,6 +30,9 @@
  *
  */
 
+#define MY_EVENT_REGISTER "exosip::register"
+#define MY_EVENT_EXPIRE "exosip::expire"
+
 #define HAVE_APR
 #include <switch.h>
 #include <eXosip2/eXosip.h>
@@ -918,6 +921,18 @@ static int find_callback(void *pArg, int argc, char **argv, char **columnNames){
        return 0;
 }
 
+static int del_callback(void *pArg, int argc, char **argv, char **columnNames){
+       switch_event_t *s_event;
+
+       if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_EXPIRE) == SWITCH_STATUS_SUCCESS) {
+               switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "key", "%s", argv[0]);
+               switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "url", "%s", argv[1]);
+               switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%d", argv[2]);
+               switch_event_fire(&s_event);
+       }
+       return 0;
+}
+
 
 static char *find_reg_url(switch_core_db_t *db, char *key, char *val, switch_size_t len)
 {
@@ -1472,7 +1487,8 @@ static void handle_message_new(eXosip_event_t *je)
                osip_message_t *tmp = NULL;
                char sql[1024] = "";
                int exptime;
-               
+               switch_event_t *s_event;
+
                for(;;) {
                        if (osip_message_get_contact(je->request, x++, &contact) < 0) {
                                break;
@@ -1507,6 +1523,13 @@ static void handle_message_new(eXosip_event_t *je)
                                                         je->request->from->url->username);
                                        
                                }
+
+                               if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_REGISTER) == SWITCH_STATUS_SUCCESS) {
+                                       switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "key", "%s", je->request->from->url->username);
+                                       switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "url", "%s", url);
+                                       switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%d", exptime);
+                                       switch_event_fire(&s_event);
+                               }
                                switch_mutex_lock(globals.reg_mutex);
                                switch_core_db_persistant_execute(globals.db, sql, 25);
                                switch_mutex_unlock(globals.reg_mutex);
@@ -1923,8 +1946,18 @@ static int config_exosip(int reload)
 static void check_expire(time_t now)
 {
        char sql[1024];
+       char *errmsg;
 
        switch_mutex_lock(globals.reg_mutex);
+       snprintf(sql, sizeof(sql), "select url from sip_registrations where expires > 0 and expires < %ld", now);       
+       switch_core_db_exec(globals.db, sql, del_callback, NULL, &errmsg);
+
+       if (errmsg) {
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQL ERR [%s][%s]\n", sql, errmsg);
+               switch_core_db_free(errmsg);
+               errmsg = NULL;
+       }
+       
        snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0 and expires < %ld", now);
        switch_core_db_persistant_execute(globals.db, sql, 1);
        switch_mutex_unlock(globals.reg_mutex);

diff --git a/src/switch_event.c b/src/switch_event.c
index 0bb5499fba4bbb57bf152fdba13fc9ca8e86392a..4c604524145975496a1852b7a011df3a1cd2ec01 100644 (file)
--- a/src/switch_event.c
+++ b/src/switch_event.c
@@ -349,6 +349,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_create_subclass(switch_event_t **ev
 
        if (subclass_name) {
                (*event)->subclass = switch_core_hash_find(CUSTOM_HASH, subclass_name);
+               switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Subclass", subclass_name);
        }
 
        return SWITCH_STATUS_SUCCESS;