Skip to content
Snippets Groups Projects
Commit 2984fbc0 authored by Olle Johansson's avatar Olle Johansson
Browse files

Change from "r" as a variable name to "dialog". "r" is commonly used for registrations, 

not dialogs, in other places of the code...


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42752 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent e7b88296
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 68 additions and 69 deletions
channels/chan_sip.c
+ 68
− 69
View file @ 2984fbc0
...@@ -2480,107 +2480,106 @@ static struct sip_user *find_user(const char *name, int realtime) ...@@ -2480,107 +2480,106 @@ static struct sip_user *find_user(const char *name, int realtime)
/*! \brief Create address structure from peer reference. /*! \brief Create address structure from peer reference.
* return -1 on error, 0 on success. * return -1 on error, 0 on success.
*/ */
static int create_addr_from_peer(struct sip_pvt *r, struct sip_peer *peer) static int create_addr_from_peer(struct sip_pvt *dialog, struct sip_peer *peer)
{ {
int natflags; int natflags;
   
if ((peer->addr.sin_addr.s_addr || peer->defaddr.sin_addr.s_addr) && if ((peer->addr.sin_addr.s_addr || peer->defaddr.sin_addr.s_addr) &&
(!peer->maxms || ((peer->lastms >= 0) && (peer->lastms <= peer->maxms)))) { (!peer->maxms || ((peer->lastms >= 0) && (peer->lastms <= peer->maxms)))) {
r->sa = (peer->addr.sin_addr.s_addr) ? peer->addr : peer->defaddr; dialog->sa = (peer->addr.sin_addr.s_addr) ? peer->addr : peer->defaddr;
r->recv = r->sa; dialog->recv = dialog->sa;
} else { } else
return -1; return -1;
}
   
ast_copy_flags(&r->flags[0], &peer->flags[0], SIP_FLAGS_TO_COPY); ast_copy_flags(&dialog->flags[0], &peer->flags[0], SIP_FLAGS_TO_COPY);
ast_copy_flags(&r->flags[1], &peer->flags[1], SIP_PAGE2_FLAGS_TO_COPY); ast_copy_flags(&dialog->flags[1], &peer->flags[1], SIP_PAGE2_FLAGS_TO_COPY);
r->capability = peer->capability; dialog->capability = peer->capability;
if (!ast_test_flag(&r->flags[1], SIP_PAGE2_VIDEOSUPPORT) && r->vrtp) { if (!ast_test_flag(&dialog->flags[1], SIP_PAGE2_VIDEOSUPPORT) && dialog->vrtp) {
ast_rtp_destroy(r->vrtp); ast_rtp_destroy(dialog->vrtp);
r->vrtp = NULL; dialog->vrtp = NULL;
} }
r->prefs = peer->prefs; dialog->prefs = peer->prefs;
if (ast_test_flag(&r->flags[1], SIP_PAGE2_T38SUPPORT)) { if (ast_test_flag(&dialog->flags[1], SIP_PAGE2_T38SUPPORT)) {
r->t38.capability = global_t38_capability; dialog->t38.capability = global_t38_capability;
if (r->udptl) { if (dialog->udptl) {
if (ast_udptl_get_error_correction_scheme(r->udptl) == UDPTL_ERROR_CORRECTION_FEC ) if (ast_udptl_get_error_correction_scheme(dialog->udptl) == UDPTL_ERROR_CORRECTION_FEC )
r->t38.capability |= T38FAX_UDP_EC_FEC; dialog->t38.capability |= T38FAX_UDP_EC_FEC;
else if (ast_udptl_get_error_correction_scheme(r->udptl) == UDPTL_ERROR_CORRECTION_REDUNDANCY ) else if (ast_udptl_get_error_correction_scheme(dialog->udptl) == UDPTL_ERROR_CORRECTION_REDUNDANCY )
r->t38.capability |= T38FAX_UDP_EC_REDUNDANCY; dialog->t38.capability |= T38FAX_UDP_EC_REDUNDANCY;
else if (ast_udptl_get_error_correction_scheme(r->udptl) == UDPTL_ERROR_CORRECTION_NONE ) else if (ast_udptl_get_error_correction_scheme(dialog->udptl) == UDPTL_ERROR_CORRECTION_NONE )
r->t38.capability |= T38FAX_UDP_EC_NONE; dialog->t38.capability |= T38FAX_UDP_EC_NONE;
r->t38.capability |= T38FAX_RATE_MANAGEMENT_TRANSFERED_TCF; dialog->t38.capability |= T38FAX_RATE_MANAGEMENT_TRANSFERED_TCF;
if (option_debug > 1) if (option_debug > 1)
ast_log(LOG_DEBUG,"Our T38 capability (%d)\n", r->t38.capability); ast_log(LOG_DEBUG,"Our T38 capability (%d)\n", dialog->t38.capability);
} }
r->t38.jointcapability = r->t38.capability; dialog->t38.jointcapability = dialog->t38.capability;
} else if (r->udptl) { } else if (dialog->udptl) {
ast_udptl_destroy(r->udptl); ast_udptl_destroy(dialog->udptl);
r->udptl = NULL; dialog->udptl = NULL;
} }
natflags = ast_test_flag(&r->flags[0], SIP_NAT) & SIP_NAT_ROUTE; natflags = ast_test_flag(&dialog->flags[0], SIP_NAT) & SIP_NAT_ROUTE;
if (r->rtp) { if (dialog->rtp) {
if (option_debug) if (option_debug)
ast_log(LOG_DEBUG, "Setting NAT on RTP to %s\n", natflags ? "On" : "Off"); ast_log(LOG_DEBUG, "Setting NAT on RTP to %s\n", natflags ? "On" : "Off");
ast_rtp_setnat(r->rtp, natflags); ast_rtp_setnat(dialog->rtp, natflags);
ast_rtp_setdtmf(r->rtp, ast_test_flag(&r->flags[0], SIP_DTMF) != SIP_DTMF_INFO); ast_rtp_setdtmf(dialog->rtp, ast_test_flag(&dialog->flags[0], SIP_DTMF) != SIP_DTMF_INFO);
ast_rtp_setdtmfcompensate(r->rtp, ast_test_flag(&r->flags[1], SIP_PAGE2_RFC2833_COMPENSATE)); ast_rtp_setdtmfcompensate(dialog->rtp, ast_test_flag(&dialog->flags[1], SIP_PAGE2_RFC2833_COMPENSATE));
} }
if (r->vrtp) { if (dialog->vrtp) {
if (option_debug) if (option_debug)
ast_log(LOG_DEBUG, "Setting NAT on VRTP to %s\n", natflags ? "On" : "Off"); ast_log(LOG_DEBUG, "Setting NAT on VRTP to %s\n", natflags ? "On" : "Off");
ast_rtp_setnat(r->vrtp, natflags); ast_rtp_setnat(dialog->vrtp, natflags);
ast_rtp_setdtmf(r->vrtp, 0); ast_rtp_setdtmf(dialog->vrtp, 0);
ast_rtp_setdtmfcompensate(r->vrtp, 0); ast_rtp_setdtmfcompensate(dialog->vrtp, 0);
} }
if (r->udptl) { if (dialog->udptl) {
if (option_debug) if (option_debug)
ast_log(LOG_DEBUG, "Setting NAT on UDPTL to %s\n", natflags ? "On" : "Off"); ast_log(LOG_DEBUG, "Setting NAT on UDPTL to %s\n", natflags ? "On" : "Off");
ast_udptl_setnat(r->udptl, natflags); ast_udptl_setnat(dialog->udptl, natflags);
} }
ast_string_field_set(r, peername, peer->username); ast_string_field_set(dialog, peername, peer->username);
ast_string_field_set(r, authname, peer->username); ast_string_field_set(dialog, authname, peer->username);
ast_string_field_set(r, username, peer->username); ast_string_field_set(dialog, username, peer->username);
ast_string_field_set(r, peersecret, peer->secret); ast_string_field_set(dialog, peersecret, peer->secret);
ast_string_field_set(r, peermd5secret, peer->md5secret); ast_string_field_set(dialog, peermd5secret, peer->md5secret);
ast_string_field_set(r, tohost, peer->tohost); ast_string_field_set(dialog, tohost, peer->tohost);
ast_string_field_set(r, fullcontact, peer->fullcontact); ast_string_field_set(dialog, fullcontact, peer->fullcontact);
if (!r->initreq.headers && !ast_strlen_zero(peer->fromdomain)) { if (!dialog->initreq.headers && !ast_strlen_zero(peer->fromdomain)) {
char *tmpcall; char *tmpcall;
char *c; char *c;
tmpcall = ast_strdupa(r->callid); tmpcall = ast_strdupa(dialog->callid);
c = strchr(tmpcall, '@'); c = strchr(tmpcall, '@');
if (c) { if (c) {
*c = '\0'; *c = '\0';
ast_string_field_build(r, callid, "%s@%s", tmpcall, peer->fromdomain); ast_string_field_build(dialog, callid, "%s@%s", tmpcall, peer->fromdomain);
} }
} }
if (ast_strlen_zero(r->tohost)) if (ast_strlen_zero(dialog->tohost))
ast_string_field_set(r, tohost, ast_inet_ntoa(r->sa.sin_addr)); ast_string_field_set(dialog, tohost, ast_inet_ntoa(dialog->sa.sin_addr));
if (!ast_strlen_zero(peer->fromdomain)) if (!ast_strlen_zero(peer->fromdomain))
ast_string_field_set(r, fromdomain, peer->fromdomain); ast_string_field_set(dialog, fromdomain, peer->fromdomain);
if (!ast_strlen_zero(peer->fromuser)) if (!ast_strlen_zero(peer->fromuser))
ast_string_field_set(r, fromuser, peer->fromuser); ast_string_field_set(dialog, fromuser, peer->fromuser);
r->maxtime = peer->maxms; dialog->maxtime = peer->maxms;
r->callgroup = peer->callgroup; dialog->callgroup = peer->callgroup;
r->pickupgroup = peer->pickupgroup; dialog->pickupgroup = peer->pickupgroup;
r->allowtransfer = peer->allowtransfer; dialog->allowtransfer = peer->allowtransfer;
/* Set timer T1 to RTT for this peer (if known by qualify=) */ /* Set timer T1 to RTT for this peer (if known by qualify=) */
/* Minimum is settable or default to 100 ms */ /* Minimum is settable or default to 100 ms */
if (peer->maxms && peer->lastms) if (peer->maxms && peer->lastms)
r->timer_t1 = peer->lastms < global_t1min ? global_t1min : peer->lastms; dialog->timer_t1 = peer->lastms < global_t1min ? global_t1min : peer->lastms;
if ((ast_test_flag(&r->flags[0], SIP_DTMF) == SIP_DTMF_RFC2833) || if ((ast_test_flag(&dialog->flags[0], SIP_DTMF) == SIP_DTMF_RFC2833) ||
(ast_test_flag(&r->flags[0], SIP_DTMF) == SIP_DTMF_AUTO)) (ast_test_flag(&dialog->flags[0], SIP_DTMF) == SIP_DTMF_AUTO))
r->noncodeccapability |= AST_RTP_DTMF; dialog->noncodeccapability |= AST_RTP_DTMF;
else else
r->noncodeccapability &= ~AST_RTP_DTMF; dialog->noncodeccapability &= ~AST_RTP_DTMF;
ast_string_field_set(r, context, peer->context); ast_string_field_set(dialog, context, peer->context);
r->rtptimeout = peer->rtptimeout; dialog->rtptimeout = peer->rtptimeout;
r->rtpholdtimeout = peer->rtpholdtimeout; dialog->rtpholdtimeout = peer->rtpholdtimeout;
r->rtpkeepalive = peer->rtpkeepalive; dialog->rtpkeepalive = peer->rtpkeepalive;
if (peer->call_limit) if (peer->call_limit)
ast_set_flag(&r->flags[0], SIP_CALL_LIMIT); ast_set_flag(&dialog->flags[0], SIP_CALL_LIMIT);
r->maxcallbitrate = peer->maxcallbitrate; dialog->maxcallbitrate = peer->maxcallbitrate;
return 0; return 0;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment