ch->pvt->write = oh323_write;
ch->pvt->indicate = oh323_indicate;
ch->pvt->fixup = oh323_fixup;
-// ch->pvt->bridge = ast_rtp_bridge;
+ /* ch->pvt->bridge = ast_rtp_bridge; */
/* Set the owner of this channel */
i->owner = ch;
ast_rtp_get_us(p->rtp, &us);
ast_rtp_get_peer(p->rtp, &them);
-
info->addr = inet_ntoa(us.sin_addr);
info->port = ntohs(us.sin_port);
-
return info;
}
strncpy(p->exten, cd.call_dest_alias, sizeof(p->exten)-1);
}
if (ast_strlen_zero(default_context)) {
- ast_log(LOG_ERROR, "Call from user '%s' rejected due to no default context\n", p->cd.call_source_aliases);
+ ast_log(LOG_ERROR, "Call from '%s' rejected due to no default context\n", p->cd.call_source_aliases);
return 0;
}
strncpy(p->context, default_context, sizeof(p->context)-1);
ast_log(LOG_DEBUG, "Sending %s to context [%s]\n", cd.call_source_aliases, p->context);
} else {
if (user->host) {
- if (strcasecmp(cd.sourceIp, inet_ntoa(user->addr.sin_addr))){
-
- if(ast_strlen_zero(default_context)) {
- ast_log(LOG_ERROR, "Call from user '%s' rejected due to non-matching IP address of '%s'\n", user->name, cd.sourceIp);
- return 0;
+ if (strcasecmp(cd.sourceIp, inet_ntoa(user->addr.sin_addr))){
+ if (ast_strlen_zero(user->context)) {
+ if (ast_strlen_zero(default_context)) {
+ ast_log(LOG_ERROR, "Call from '%s' rejected due to non-matching IP address (%s) and no default context\n", user->name, cd.sourceIp);
+ return 0;
+ }
+ strncpy(p->context, default_context, sizeof(p->context)-1);
+ } else {
+ strncpy(p->context, user->context, sizeof(p->context)-1);
}
-
- strncpy(p->context, default_context, sizeof(p->context)-1);
- sprintf(p->exten,"i");
-
+ sprintf(p->exten, "i");
+ ast_log(LOG_ERROR, "Call from '%s' rejected due to non-matching IP address (%s)s\n", user->name, cd.sourceIp);
goto exit;
}
}
}
strncpy(p->context, user->context, sizeof(p->context)-1);
p->bridge = user->bridge;
- p->nat = user->nat;
+ p->nat = user->nat;
if (!ast_strlen_zero(user->callerid)) {
strncpy(p->callerid, user->callerid, sizeof(p->callerid) - 1);
ast_rtp_get_peer(rtp, &them);
ast_rtp_get_us(rtp, &us);
-
h323_native_bridge(p->cd.call_token, inet_ntoa(them.sin_addr), mode);
return 0;
PString sourceName;
PString sourceAliases;
PString destAliases;
+ PString sourceIp;
PIPSocket::Address Ip;
WORD sourcePort;
char *s, *s1;
cd.call_source_name = (const char *)sourceName;
GetSignallingChannel()->GetRemoteAddress().GetIpAndPort(Ip, sourcePort);
- cd.sourceIp = (const char *)Ip.AsString();
-
+ sourceIp = Ip.AsString();
+ cd.sourceIp = (const char *)sourceIp;
+
+
+
/* Notify Asterisk of the request */
int res = on_incoming_call(cd);
return NULL;
}
- GetControlChannel().GetLocalAddress().GetIpAndPort(externalIpAddress, port);
+ GetControlChannel().GetLocalAddress().GetIpAndPort(externalIpAddress, port);
externalPort = info->port;
if (h323debug) {