[asterisk-commits] marquis: branch group/pinana-publish-1.4 r296506 - /team/group/pinana-publish...

[SVN commits to the Asterisk project]

Author: marquis
Date: Sat Nov 27 14:23:23 2010
New Revision: 296506

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=296506
Log:
Committing some cleanups and in-progress work.  Chan_sip now comes with more segfault!

Modified:
    team/group/pinana-publish-1.4/channels/chan_sip.c

Modified: team/group/pinana-publish-1.4/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pinana-publish-1.4/channels/chan_sip.c?view=diff&rev=296506&r1=296505&r2=296506
==============================================================================
--- team/group/pinana-publish-1.4/channels/chan_sip.c (original)
+++ team/group/pinana-publish-1.4/channels/chan_sip.c Sat Nov 27 14:23:23 2010
@@ -9847,7 +9847,7 @@
 	i = ao2_iterator_init(devstate_publishers, 0);
 	while ((p = ao2_iterator_next(&i))) {
 		AST_LIST_TRAVERSE(&p->filters, curfilter, next) {
-			if (strncmp(curfilter->criteria, sc->dev, strlen(curfilter->criteria))) {
+			if (!strncmp(curfilter->criteria, sc->dev, strlen(curfilter->criteria))) {
 				sip_devicestate_publish(p, sc);
 			}
 		}
@@ -19470,13 +19470,13 @@
 
 		for (v = ast_variable_browse(pcfg, cat); v; v = v->next) {
 			if (!strcasecmp(v->name, "type")) {
-				type = ast_strdupa(v->name);
+				type = ast_strdupa(v->value);
 			} else if (!strcasecmp(v->name, "host")) {
-				host = ast_strdupa(v->name);
+				host = ast_strdupa(v->value);
 			} else if (!strcasecmp(v->name, "filter")) {
-				filter = ast_strdupa(v->name);
+				filter = ast_strdupa(v->value);
 			} else if (!strcasecmp(v->name, "domain")) {
-				domain = ast_strdupa(v->name);
+				domain = ast_strdupa(v->value);
 			}
 		}
 		if (!type) {
@@ -19487,12 +19487,6 @@
 			publisher = sip_publisher_init(name, host, domain, filter);
 			if (publisher) {
 				ao2_link(devstate_publishers, publisher);
-			}
-		}
-		if (!strcasecmp(type, "subscribe") || !strcasecmp(type, "bidirectional")) {
-			subscriber = sip_subscriber_init(name, host, domain, filter);
-			if (subscriber) {
-				/* Link subscriber once container exists */
 			}
 		}
 	}