Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Apply host access rules in SIP

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1790 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.0
Mark Spencer 22 years ago
parent 55beaa4d47
commit 3cfe7e6e25
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
channels/chan_sip.c
Unescape View File

@ -3560,7 +3560,7 @@ static int register_verify(struct sip_pvt *p, struct sockaddr_in *sin, struct si
ast_mutex_lock(&peerl.lock); ast_mutex_lock(&peerl.lock);
peer = peerl.peers; peer = peerl.peers;
while(peer) { while(peer) {
if (!strcasecmp(peer->name, name)) { if (!strcasecmp(peer->name, name) && ast_apply_ha(peer->ha,sin)) {
if (!peer->dynamic) { if (!peer->dynamic) {
ast_log(LOG_NOTICE, "Peer '%s' isn't dynamic\n", peer->name); ast_log(LOG_NOTICE, "Peer '%s' isn't dynamic\n", peer->name);
break; break;
@ -3931,7 +3931,7 @@ static char *get_calleridname(char *input,char *output)
} }
return output; return output;
} }
static int check_user(struct sip_pvt *p, struct sip_request *req, char *cmd, char *uri, int reliable) static int check_user(struct sip_pvt *p, struct sip_request *req, char *cmd, char *uri, int reliable, struct sockaddr_in *sin)
{ {
struct sip_user *user; struct sip_user *user;
struct sip_peer *peer; struct sip_peer *peer;
@ -3967,7 +3967,7 @@ static int check_user(struct sip_pvt *p, struct sip_request *req, char *cmd, cha
ast_mutex_lock(&userl.lock); ast_mutex_lock(&userl.lock);
user = userl.users; user = userl.users;
while(user) { while(user) {
if (!strcasecmp(user->name, of)) { if (!strcasecmp(user->name, of) && ast_apply_ha(user->ha,sin)) {
p->nat = user->nat; p->nat = user->nat;
if (p->rtp) { if (p->rtp) {
ast_log(LOG_DEBUG, "Setting NAT on RTP to %d\n", p->nat); ast_log(LOG_DEBUG, "Setting NAT on RTP to %d\n", p->nat);
@ -5020,7 +5020,7 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc
ast_verbose("Ignoring this request\n"); ast_verbose("Ignoring this request\n");
if (!p->lastinvite) { if (!p->lastinvite) {
/* Handle authentication if this is our first invite */ /* Handle authentication if this is our first invite */
res = check_user(p, req, cmd, e, 1); res = check_user(p, req, cmd, e, 1, sin);
if (res) { if (res) {
if (res < 0) { if (res < 0) {
ast_log(LOG_NOTICE, "Failed to authenticate user %s\n", get_header(req, "From")); ast_log(LOG_NOTICE, "Failed to authenticate user %s\n", get_header(req, "From"));
@ -5239,7 +5239,7 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc
if (!p->lastinvite) { if (!p->lastinvite) {
/* Handle authentication if this is our first subscribe */ /* Handle authentication if this is our first subscribe */
res = check_user(p, req, cmd, e, 0); res = check_user(p, req, cmd, e, 0, sin);
if (res) { if (res) {
if (res < 0) { if (res < 0) {
ast_log(LOG_NOTICE, "Failed to authenticate user %s for SUBSCRIBE\n", get_header(req, "From")); ast_log(LOG_NOTICE, "Failed to authenticate user %s for SUBSCRIBE\n", get_header(req, "From"));

Write Preview
Loading…
Cancel
Save