Merged revisions 133649 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r133649 | tilghman | 2008-07-25 12:19:39 -0500 (Fri, 25 Jul 2008) | 8 lines

Fix some errant device states by making the devicestate API more strict in
terms of the device argument (only without the unique identifier appended).
(closes issue #12771)
 Reported by: davidw
 Patches:
       20080717__bug12771.diff.txt uploaded by Corydon76 (license 14)
 Tested by: davidw, jvandal, murf

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@133665 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 150c1e9..9a68b81 100644 (file)
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -272,6 +272,18 @@ static void agent_devicestate_cb(const struct ast_event *event, void *unused)
        const char *device;
        enum ast_device_state state;
 
+       state = ast_event_get_ie_uint(event, AST_EVENT_IE_STATE);
+       device = ast_event_get_ie_str(event, AST_EVENT_IE_DEVICE);
+
+       if (ast_strlen_zero(device)) {
+               return;
+       }
+
+       /* Skip Agent status */
+       if (!strncasecmp(device, "Agent/", 6)) {
+               return;
+       }
+
        /* Try to be safe, but don't deadlock */
        for (i = 0; i < 10; i++) {
                if ((res = AST_LIST_TRYLOCK(&agents)) == 0) {
@@ -282,14 +294,6 @@ static void agent_devicestate_cb(const struct ast_event *event, void *unused)
                return;
        }
 
-       state = ast_event_get_ie_uint(event, AST_EVENT_IE_STATE);
-       device = ast_event_get_ie_str(event, AST_EVENT_IE_DEVICE);
-
-       if (ast_strlen_zero(device)) {
-               AST_LIST_UNLOCK(&agents);
-               return;
-       }
-
        AST_LIST_TRAVERSE(&agents, p, list) {
                ast_mutex_lock(&p->lock);
                if (p->chan) {
@@ -514,6 +518,7 @@ static struct ast_frame *agent_read(struct ast_channel *ast)
                        }
                        p->chan = NULL;
                        p->inherited_devicestate = -1;
+                       ast_device_state_changed("Agent/%s", p->agent);
                        p->acknowledged = 0;
                }
        } else {
@@ -729,6 +734,7 @@ static int agent_call(struct ast_channel *ast, char *dest, int timeout)
                /* Agent hung-up */
                p->chan = NULL;
                p->inherited_devicestate = -1;
+               ast_device_state_changed("Agent/%s", p->agent);
        }
 
        if (!res) {
@@ -850,6 +856,7 @@ static int agent_hangup(struct ast_channel *ast)
                                ast_hangup(p->chan);
                                p->chan = NULL;
                                p->inherited_devicestate = -1;
+                               ast_device_state_changed("Agent/%s", p->agent);
                        }
                        ast_debug(1, "Hungup, howlong is %d, autologoff is %d\n", howlong, p->autologoff);
                        if ((p->deferlogoff) || (howlong && p->autologoff && (howlong > p->autologoff))) {

diff --git a/main/channel.c b/main/channel.c
index 4437155..d562afd 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -1277,7 +1277,7 @@ void ast_channel_free(struct ast_channel *chan)
        struct ast_frame *f;
        struct varshead *headp;
        struct ast_datastore *datastore = NULL;
-       char name[AST_CHANNEL_NAME];
+       char name[AST_CHANNEL_NAME], *dashptr;
        
        headp=&chan->varshead;
        
@@ -1310,6 +1310,9 @@ void ast_channel_free(struct ast_channel *chan)
                sched_context_destroy(chan->sched);
 
        ast_copy_string(name, chan->name, sizeof(name));
+       if ((dashptr = strrchr(name, '-'))) {
+               *dashptr = '\0';
+       }
 
        /* Stop monitoring */
        if (chan->monitor)
@@ -4086,12 +4089,18 @@ void ast_set_callerid(struct ast_channel *chan, const char *cid_num, const char
 int ast_setstate(struct ast_channel *chan, enum ast_channel_state state)
 {
        int oldstate = chan->_state;
+       char name[AST_CHANNEL_NAME], *dashptr;
 
        if (oldstate == state)
                return 0;
 
+       ast_copy_string(name, chan->name, sizeof(name));
+       if ((dashptr = strrchr(name, '-'))) {
+               *dashptr = '\0';
+       }
+
        chan->_state = state;
-       ast_device_state_changed_literal(chan->name);
+       ast_device_state_changed_literal(name);
        /* setstate used to conditionally report Newchannel; this is no more */
        manager_event(EVENT_FLAG_CALL,
                      "Newstate",

diff --git a/main/devicestate.c b/main/devicestate.c
index 6e0af66..c7fe08e 100644 (file)
--- a/main/devicestate.c
+++ b/main/devicestate.c
@@ -457,15 +457,11 @@ static void do_state_change(const char *device)
        devstate_event(device, state, CACHE_OFF);
 }
 
-static int __ast_devstate_changed_literal(enum ast_device_state state, char *buf, int norecurse)
+int ast_devstate_changed_literal(enum ast_device_state state, const char *device)
 {
-       char *device;
        struct state_change *change;
-       char *tmp = NULL;
 
-       ast_debug(3, "Notification of state change to be queued on device/channel %s\n", buf);
-
-       device = buf;
+       ast_debug(3, "Notification of state change to be queued on device/channel %s\n", device);
 
        if (state != AST_DEVICE_UNKNOWN) {
                devstate_event(device, state, CACHE_ON);
@@ -482,37 +478,12 @@ static int __ast_devstate_changed_literal(enum ast_device_state state, char *buf
                AST_LIST_UNLOCK(&state_changes);
        }
 
-       /* The problem with this API is that a device may be called with the unique
-        * identifier appended or not, but it's separated from the channel name
-        * with a '-', which is also a legitimate character in a channel name.  So,
-        * we have to force both names to get their names checked for state changes
-        * to ensure that the right one gets notified.  Not a huge performance hit,
-        * but it might could be fixed by an enterprising programmer in trunk.
-        */
-       if (!norecurse && (tmp = strrchr(device, '-'))) {
-               *tmp = '\0';
-               __ast_devstate_changed_literal(state, device, 1);
-       }
-       
        return 1;
 }
 
-int ast_devstate_changed_literal(enum ast_device_state state, const char *dev)
-{
-       char *buf;
-
-       buf = ast_strdupa(dev);
-
-       return __ast_devstate_changed_literal(state, buf, 0);
-}
-
 int ast_device_state_changed_literal(const char *dev)
 {
-       char *buf;
-
-       buf = ast_strdupa(dev);
-
-       return __ast_devstate_changed_literal(AST_DEVICE_UNKNOWN, buf, 0);
+       return ast_devstate_changed_literal(AST_DEVICE_UNKNOWN, dev);
 }
 
 int ast_devstate_changed(enum ast_device_state state, const char *fmt, ...) 
@@ -524,7 +495,7 @@ int ast_devstate_changed(enum ast_device_state state, const char *fmt, ...)
        vsnprintf(buf, sizeof(buf), fmt, ap);
        va_end(ap);
 
-       return __ast_devstate_changed_literal(state, buf, 0);
+       return ast_devstate_changed_literal(state, buf);
 }
 
 /*! \brief Accept change notification, add it to change queue */
@@ -537,7 +508,7 @@ int ast_device_state_changed(const char *fmt, ...)
        vsnprintf(buf, sizeof(buf), fmt, ap);
        va_end(ap);
 
-       return __ast_devstate_changed_literal(AST_DEVICE_UNKNOWN, buf, 0);
+       return ast_devstate_changed_literal(AST_DEVICE_UNKNOWN, buf);
 }
 
 /*! \brief Go through the dev state change queue and update changes in the dev state thread */