kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-27 02:44:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

ensure that type=peer entries are only matched on IP/port, not on name (after oej audits all the calls to find_peer() to make sure that forcenamematch is set correctly in each case)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@150052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-10-16 15:02:10 +00:00
parent 11a94d5b01
commit 2f3193ec70
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_sip.c
+17 -1
View File
@@ -4177,9 +4177,25 @@ static struct sip_peer *find_peer(const char *peer, struct sockaddr_in *sin, int
struct sip_peer *p = NULL;
struct sip_peer tmp_peer;
auto int find_by_name(void *obj, void *arg, int flags);
int find_by_name(void *obj, void *arg, int flags)
{
struct sip_peer *search = obj, *match = arg;
if (strcasecmp(search->name, match->name)) {
return 0;
}
if (forcenamematch && search->onlymatchonip) {
return 0;
}
return CMP_MATCH | CMP_STOP;
}
if (peer) {
ast_copy_string(tmp_peer.name, peer, sizeof(tmp_peer.name));
p = ao2_t_find(peers, &tmp_peer, OBJ_POINTER, "ao2_find in peers table");
p = ao2_t_callback(peers, OBJ_POINTER, find_by_name, &tmp_peer, "ao2_find in peers table");
} else if (sin) { /* search by addr? */
tmp_peer.addr.sin_addr.s_addr = sin->sin_addr.s_addr;
tmp_peer.addr.sin_port = sin->sin_port;