kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-04 03:20:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@15937 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-03-29 01:06:53 +00:00
parent b4589618c4
commit f86140a213
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_sip.c
View File

@@ -5462,7 +5462,7 @@ static int transmit_register(struct sip_registry *r, int sipmethod, char *auth,
if (r->portno) if (r->portno)
p->sa.sin_port = htons(r->portno); p->sa.sin_port = htons(r->portno);
else /* Set registry port to the port set from the peer definition/srv or default */ 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 */ ast_set_flag(p, SIP_OUTGOING); /* Registration is outgoing call */
r->call=p; /* Save pointer to SIP packet */ r->call=p; /* Save pointer to SIP packet */
p->registry=ASTOBJ_REF(r); /* Add pointer to registry in packet */ p->registry=ASTOBJ_REF(r); /* Add pointer to registry in packet */

3
include/asterisk/linkedlists.h
View File

@@ -1,7 +1,7 @@
/* /*
* Asterisk -- An open source telephony toolkit. * Asterisk -- An open source telephony toolkit.
* *
* Copyright (C) 1999 - 2005, Digium, Inc. * Copyright (C) 1999 - 2006, Digium, Inc.
* *
* Mark Spencer <markster@digium.com> * Mark Spencer <markster@digium.com>
* Kevin P. Fleming <kpfleming@digium.com> * Kevin P. Fleming <kpfleming@digium.com>
@@ -279,6 +279,7 @@ struct { \
__list_next = (var) ? (var)->field.next : NULL; \ __list_next = (var) ? (var)->field.next : NULL; \
(var); \ (var); \
__list_prev = __new_prev, (var) = __list_next, \ __list_prev = __new_prev, (var) = __list_next, \
__new_prev = (var), \
__list_next = (var) ? (var)->field.next : NULL \ __list_next = (var) ? (var)->field.next : NULL \
) )