tweak to last commit

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 29d5acab9f4de0983f305a0b82ec9cab8b11518a..31e234ab4cf2aed4c99aa01f887f2ad538342ec4 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -1703,7 +1703,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", conference->name);
                switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain);
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "force-status", "Inactive");
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "idle");
+               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "unknown");
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
                switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
@@ -7210,7 +7210,7 @@ static void pres_event_handler(switch_event_t *event)
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", conf_name);
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", to);
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "force-status", "Idle");
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "idle");
+               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "unknown");
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
                switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
@@ -7251,7 +7251,7 @@ static void send_presence(switch_event_types_t id)
                                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", name);
                                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", name);
                                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "force-status", status ? status : "Available");
-                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "idle");
+                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "unknown");
                                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
                                switch_event_fire(&event);
                        }

diff --git a/src/mod/applications/mod_valet_parking/mod_valet_parking.c b/src/mod/applications/mod_valet_parking/mod_valet_parking.c
index ba9893cb083a882b5a105bf2812a6a189360c71d..ba4d8605e18fb0b1df8d8fcb7b16bba0a8458ef7 100644 (file)
--- a/src/mod/applications/mod_valet_parking/mod_valet_parking.c
+++ b/src/mod/applications/mod_valet_parking/mod_valet_parking.c
@@ -256,7 +256,7 @@ static void valet_send_presence(const char *lot_name, valet_lot_t *lot, valet_to
                        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", lot_name);
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", lot_name, domain_name);
                        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "force-status", "Empty");
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "idle");
+                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "unknown");
                        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
                        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
@@ -292,7 +292,7 @@ static void valet_send_presence(const char *lot_name, valet_lot_t *lot, valet_to
                        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", token->ext);
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", token->ext, domain_name);
                        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "force-status", "Empty");
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "idle");
+                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "unknown");
                        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
                        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
@@ -672,7 +672,7 @@ static void pres_event_handler(switch_event_t *event)
                                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", lot_name);
                                switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", lot_name, domain_name);
                                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "force-status", "Empty");
-                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "idle");
+                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "unknown");
                                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
                                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
                                switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
@@ -733,7 +733,7 @@ static void pres_event_handler(switch_event_t *event)
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", lot_name);
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", to);
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "force-status", "Empty");
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "idle");
+               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "unknown");
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
                switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index b264a082e138f53eb91bc806422b7830c73b5ac9..582e8f9eb25bd4a7f238aecd917d6b335b1cf740 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -1298,7 +1298,7 @@ static char *translate_rpid(char *in)
        }
 
        if (!strcasecmp(in, "idle")) {
-               r = "online";
+               r = "busy";
        }
 
   end: