From f86140a2135c947767f1d38e17a323a21501bb3e Mon Sep 17 00:00:00 2001 From: Automerge script Date: Wed, 29 Mar 2006 01:06:53 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@15937 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 2 +- include/asterisk/linkedlists.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 115394d3f7..5308b9ecd9 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5462,7 +5462,7 @@ static int transmit_register(struct sip_registry *r, int sipmethod, char *auth, if (r->portno) p->sa.sin_port = htons(r->portno); else /* Set registry port to the port set from the peer definition/srv or default */ - r->portno = p->sa.sin_port; + r->portno = ntohs(p->sa.sin_port); ast_set_flag(p, SIP_OUTGOING); /* Registration is outgoing call */ r->call=p; /* Save pointer to SIP packet */ p->registry=ASTOBJ_REF(r); /* Add pointer to registry in packet */ diff --git a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h index 8cf251b8bf..ed1d48340d 100644 --- a/include/asterisk/linkedlists.h +++ b/include/asterisk/linkedlists.h @@ -1,7 +1,7 @@ /* * Asterisk -- An open source telephony toolkit. * - * Copyright (C) 1999 - 2005, Digium, Inc. + * Copyright (C) 1999 - 2006, Digium, Inc. * * Mark Spencer * Kevin P. Fleming @@ -279,6 +279,7 @@ struct { \ __list_next = (var) ? (var)->field.next : NULL; \ (var); \ __list_prev = __new_prev, (var) = __list_next, \ + __new_prev = (var), \ __list_next = (var) ? (var)->field.next : NULL \ ) -- 2.47.2