[asterisk-commits] file: trunk r63613 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed May  9 11:56:45 2007
New Revision: 63613

URL: http://svn.digium.com/view/asterisk?view=rev&rev=63613
Log:
Merged revisions 63611 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r63611 | file | 2007-05-09 12:54:56 -0400 (Wed, 09 May 2007) | 10 lines

Merged revisions 63610 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r63610 | file | 2007-05-09 12:51:03 -0400 (Wed, 09 May 2007) | 2 lines

Properly handle hints that point to multiple devices in chan_sip. Why chan_sip is even doing this I have no idea but I would rather not go into a rant. (issue #9536 reported by rlister)

........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=63613&r1=63612&r2=63613
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed May  9 11:56:45 2007
@@ -7494,11 +7494,14 @@
 	
 	/* Check which device/devices we are watching  and if they are registered */
 	if (ast_get_hint(hint, sizeof(hint), NULL, 0, NULL, p->context, p->exten)) {
-		/* If they are not registered, we will override notification and show no availability */
-		if (ast_device_state(hint) == AST_DEVICE_UNAVAILABLE) {
-			local_state = NOTIFY_CLOSED;
-			pidfstate = "away";
-			pidfnote = "Not online";
+		char *hint2 = hint, *individual_hint = NULL;
+		while ((individual_hint = strsep(&hint2, "&"))) {
+			/* If they are not registered, we will override notification and show no availability */
+			if (ast_device_state(individual_hint) == AST_DEVICE_UNAVAILABLE) {
+				local_state = NOTIFY_CLOSED;
+				pidfstate = "away";
+				pidfnote = "Not online";
+			}
 		}
 	}