kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-05 22:32:32 -07:00
Code Issues Packages Projects Releases Wiki Activity

merge from astobj2-r47450: use UNLINK to remove a packet from its queue,

Browse Source 
and related code rearrangement.

Approved by: oej

This could be made better if we declared

	struct sip_pvt *dialpg = pkt->owner;

at the beginning of the function, and use it throughout the function.
I'll let the boss decide :)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47539 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-11-13 14:29:31 +00:00
parent c26ccb97b9
commit 52148c96f5
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_sip.c
+10 -15
View File
@@ -1930,23 +1930,18 @@ static int retrans_pkt(void *data)
ast_set_flag(&pkt->owner->flags[0], SIP_NEEDDESTROY);
}
}
/* In any case, go ahead and remove the packet */
/* Remove the packet */
for (prev = NULL, cur = pkt->owner->packets; cur; prev = cur, cur = cur->next) {
if (cur == pkt)
break;
if (cur == pkt) {
UNLINK(cur, pkt->owner->packets, prev);
sip_pvt_unlock(pkt->owner);
free(pkt);
return 0;
}
}
if (cur) {
if (prev)
prev->next = cur->next;
else
pkt->owner->packets = cur->next;
sip_pvt_unlock(pkt->owner);
free(cur);
pkt = NULL;
} else
ast_log(LOG_WARNING, "Weird, couldn't find packet owner!\n");
if (pkt)
sip_pvt_unlock(pkt->owner);
/* error case */
ast_log(LOG_WARNING, "Weird, couldn't find packet owner!\n");
sip_pvt_unlock(pkt->owner);
return 0;
}