[asterisk-commits] oej: branch oej/obproxy r64209 - in /team/oej/obproxy: ./ channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon May 14 09:30:50 2007
New Revision: 64209

URL: http://svn.digium.com/view/asterisk?view=rev&rev=64209
Log:
Resolve conflict, reset automerge

Modified:
    team/oej/obproxy/   (props changed)
    team/oej/obproxy/channels/chan_misdn.c
    team/oej/obproxy/channels/chan_sip.c

Propchange: team/oej/obproxy/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/obproxy/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/oej/obproxy/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon May 14 09:30:50 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-61417
+/branches/1.4:1-61495

Modified: team/oej/obproxy/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/team/oej/obproxy/channels/chan_misdn.c?view=diff&rev=64209&r1=64208&r2=64209
==============================================================================
--- team/oej/obproxy/channels/chan_misdn.c (original)
+++ team/oej/obproxy/channels/chan_misdn.c Mon May 14 09:30:50 2007
@@ -2400,9 +2400,6 @@
 	
 	bc=p->bc;
 
-	if (p)
-		export_aoc_vars(p->originator, ast, bc);
-	
 	MISDN_ASTERISK_TECH_PVT(ast)=NULL;
 	p->ast=NULL;
 

Modified: team/oej/obproxy/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/obproxy/channels/chan_sip.c?view=diff&rev=64209&r1=64208&r2=64209
==============================================================================
--- team/oej/obproxy/channels/chan_sip.c (original)
+++ team/oej/obproxy/channels/chan_sip.c Mon May 14 09:30:50 2007
@@ -5698,7 +5698,8 @@
 	add_header(resp, "To", ot);
 	copy_header(resp, req, "Call-ID");
 	copy_header(resp, req, "CSeq");
-	add_header(resp, "User-Agent", global_useragent);
+	if (!ast_strlen_zero(global_useragent))
+		add_header(resp, "User-Agent", global_useragent);
 	add_header(resp, "Allow", ALLOWED_METHODS);
 	add_header(resp, "Supported", SUPPORTED_EXTENSIONS);
 	if (msg[0] == '2' && (p->method == SIP_SUBSCRIBE || p->method == SIP_REGISTER)) {
@@ -5813,7 +5814,8 @@
 	copy_header(req, orig, "Call-ID");
 	add_header(req, "CSeq", tmp);
 
-	add_header(req, "User-Agent", global_useragent);
+	if (!ast_strlen_zero(global_useragent))
+		add_header(req, "User-Agent", global_useragent);
 	add_header(req, "Max-Forwards", DEFAULT_MAX_FORWARDS);
 
 	if (!ast_strlen_zero(p->rpid))
@@ -6857,7 +6859,8 @@
 	add_header(req, "Contact", p->our_contact);
 	add_header(req, "Call-ID", p->callid);
 	add_header(req, "CSeq", tmp);
-	add_header(req, "User-Agent", global_useragent);
+	if (!ast_strlen_zero(global_useragent))
+		add_header(req, "User-Agent", global_useragent);
 	add_header(req, "Max-Forwards", DEFAULT_MAX_FORWARDS);
 	if (!ast_strlen_zero(p->rpid))
 		add_header(req, "Remote-Party-ID", p->rpid);
@@ -7448,7 +7451,8 @@
 	add_header(&req, "To", to);
 	add_header(&req, "Call-ID", p->callid);
 	add_header(&req, "CSeq", tmp);
-	add_header(&req, "User-Agent", global_useragent);
+	if (!ast_strlen_zero(global_useragent))
+		add_header(&req, "User-Agent", global_useragent);
 	add_header(&req, "Max-Forwards", DEFAULT_MAX_FORWARDS);
 
 	
@@ -16051,7 +16055,7 @@
 
 	if (peer) {
 		/* Already in the list, remove it and it will be added back (or FREE'd)  */
-		found++;
+		found = 1;
 		if (!(peer->objflags & ASTOBJ_FLAG_MARKED))
 			firstpass = 0;
  	} else {
@@ -16133,8 +16137,7 @@
 		} else if (!strcasecmp(v->name, "host")) {
 			if (!strcasecmp(v->value, "dynamic")) {
 				/* They'll register with us */
-				ast_set_flag(&peer->flags[1], SIP_PAGE2_DYNAMIC);
-				if (!found) {
+				if (!found || !ast_test_flag(&peer->flags[1], SIP_PAGE2_DYNAMIC)) {
 					/* Initialize stuff iff we're not found, otherwise
 					   we keep going with what we had */
 					memset(&peer->addr.sin_addr, 0, 4);
@@ -16143,6 +16146,7 @@
 						peer->defaddr.sin_port = peer->addr.sin_port;
 						peer->addr.sin_port = 0;
 					}
+					ast_set_flag(&peer->flags[1], SIP_PAGE2_DYNAMIC);
 				}
 			} else {
 				/* Non-dynamic.  Make sure we become that way if we're not */