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

Merged revisions 370772 via svnmerge from

Browse Source 
file:///srv/subversion/repos/asterisk/branches/10

................
  r370772 | mmichelson | 2012-08-03 16:50:29 -0500 (Fri, 03 Aug 2012) | 41 lines
  
  Multiple revisions 370769-370771
  
  ........
    r370769 | mmichelson | 2012-08-03 16:35:00 -0500 (Fri, 03 Aug 2012) | 24 lines
    
    Fix error in the "IPorHost" section of a SIP dialstring.
    
    This is based on the review request posted by Walter Doekes
    (referenced lower in the commit message)
    
    The main fix here is to treat the IPorHost portion of the dial
    string as a temporary outbound proxy. This ensures requests
    get sent to the proper location.
    
    Due to the age of the request, some parts were no longer relevant.
    For instance, the request moved outbound proxy parsing code into
    a single method. This is done in a previous commit, so it was not
    necessary to do again.
    
    Also, the review request fixed some errors with regards to request
    routing for CANCEL and ACK requests. This has also been fixed in
    more recent commits.
    
    (closes issue ASTERISK-19677)
    reported by Walter Doekes
    
    Review https://reviewboard.asterisk.org/r/1859
  ........
    r370770 | mmichelson | 2012-08-03 16:39:35 -0500 (Fri, 03 Aug 2012) | 3 lines
    
    Remove unused variable.
  ........
    r370771 | mmichelson | 2012-08-03 16:43:52 -0500 (Fri, 03 Aug 2012) | 5 lines
    
    Seriously? Another compilation error fixed.
    
    Somebody beat me.
  ........
  
  Merged revisions 370769-370771 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@370793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
10-digiumphones
Automerge script 14 years ago
parent 81fdb9dfc9
commit adc08df2d1
3 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File

51
channels/chan_sip.c
Unescape View File

@ -1548,7 +1548,7 @@ static int respprep(struct sip_request *resp, struct sip_pvt *p, const char *msg
static const struct ast_sockaddr *sip_real_dst(const struct sip_pvt *p);
static void build_via(struct sip_pvt *p);
static int create_addr_from_peer(struct sip_pvt *r, struct sip_peer *peer);
static int create_addr(struct sip_pvt *dialog, const char *opeer, struct ast_sockaddr *addr, int newdialog, struct ast_sockaddr *remote_address);
static int create_addr(struct sip_pvt *dialog, const char *opeer, struct ast_sockaddr *addr, int newdialog);
static char *generate_random_string(char *buf, size_t size);
static void build_callid_pvt(struct sip_pvt *pvt);
static void change_callid_pvt(struct sip_pvt *pvt, const char *callid);
@ -1972,7 +1972,7 @@ static int sip_cc_monitor_request_cc(struct ast_cc_monitor *monitor, int *availa
sip_pvt_lock(monitor_instance->subscription_pvt);
ast_set_flag(&monitor_instance->subscription_pvt->flags[0], SIP_OUTGOING);
create_addr(monitor_instance->subscription_pvt, monitor_instance->peername, 0, 1, NULL);
create_addr(monitor_instance->subscription_pvt, monitor_instance->peername, 0, 1);
ast_sip_ouraddrfor(&monitor_instance->subscription_pvt->sa, &monitor_instance->subscription_pvt->ourip, monitor_instance->subscription_pvt);
monitor_instance->subscription_pvt->subscribed = CALL_COMPLETION;
monitor_instance->subscription_pvt->expiry = when;
@ -3220,6 +3220,12 @@ unsigned int port_str2int(const char *pt, unsigned int standard)
/*! \brief Get default outbound proxy or global proxy */
static struct sip_proxy *obproxy_get(struct sip_pvt *dialog, struct sip_peer *peer)
{
if (dialog && dialog->options && dialog->options->outboundproxy) {
if (sipdebug) {
ast_debug(1, "BLAH\n");
}
return dialog->options->outboundproxy;
}
if (peer && peer->outboundproxy) {
if (sipdebug) {
ast_debug(1, "OBPROXY: Applying peer OBproxy to this call\n");
@ -5504,7 +5510,7 @@ static inline int default_sip_port(enum sip_transport type)
/*! \brief create address structure from device name
* Or, if peer not found, find it in the global DNS
* returns TRUE (-1) on failure, FALSE on success */
static int create_addr(struct sip_pvt *dialog, const char *opeer, struct ast_sockaddr *addr, int newdialog, struct ast_sockaddr *remote_address)
static int create_addr(struct sip_pvt *dialog, const char *opeer, struct ast_sockaddr *addr, int newdialog)
{
struct sip_peer *peer;
char *peername, *peername2, *hostn;
@ -5535,9 +5541,6 @@ static int create_addr(struct sip_pvt *dialog, const char *opeer, struct ast_soc
set_socket_transport(&dialog->socket, 0);
}
res = create_addr_from_peer(dialog, peer);
if (!ast_sockaddr_isnull(remote_address)) {
ast_sockaddr_copy(&dialog->sa, remote_address);
}
dialog->relatedpeer = sip_ref_peer(peer, "create_addr: setting dialog's relatedpeer pointer");
sip_unref_peer(peer, "create_addr: unref peer from sip_find_peer hashtab lookup");
return res;
@ -5896,8 +5899,12 @@ void __sip_destroy(struct sip_pvt *p, int lockowner, int lockdialoglist)
if (dumphistory)
sip_dump_history(p);
if (p->options)
if (p->options) {
if (p->options->outboundproxy) {
ao2_ref(p->options->outboundproxy, -1);
}
ast_free(p->options);
}
if (p->notify) {
ast_variables_destroy(p->notify->headers);
@ -12696,7 +12703,7 @@ static int transmit_publish(struct sip_epa_entry *epa_entry, enum sip_publish_ty
sip_pvt_lock(pvt);
if (create_addr(pvt, epa_entry->destination, NULL, TRUE, NULL)) {
if (create_addr(pvt, epa_entry->destination, NULL, TRUE)) {
sip_pvt_unlock(pvt);
dialog_unlink_all(pvt);
dialog_unref(pvt, "create_addr failed in transmit_publish. Unref dialog");
@ -13010,7 +13017,7 @@ static int __sip_subscribe_mwi_do(struct sip_subscription_mwi *mwi)
}
/* Setup the destination of our subscription */
if (create_addr(mwi->call, mwi->hostname, &mwi->us, 0, NULL)) {
if (create_addr(mwi->call, mwi->hostname, &mwi->us, 0)) {
dialog_unlink_all(mwi->call);
mwi->call = dialog_unref(mwi->call, "unref dialog after unlink_all");
return 0;
@ -13518,7 +13525,7 @@ static int manager_sipnotify(struct mansession *s, const struct message *m)
return 0;
}
if (create_addr(p, channame, NULL, 0, NULL)) {
if (create_addr(p, channame, NULL, 0)) {
/* Maybe they're not registered, etc. */
dialog_unlink_all(p);
dialog_unref(p, "unref dialog inside for loop" );
@ -13862,7 +13869,7 @@ static int transmit_register(struct sip_registry *r, int sipmethod, const char *
}
/* Find address to hostname */
if (create_addr(p, S_OR(r->peername, r->hostname), &r->us, 0, NULL)) {
if (create_addr(p, S_OR(r->peername, r->hostname), &r->us, 0)) {
/* we have what we hope is a temporary network error,
* probably DNS. We need to reschedule a registration try */
dialog_unlink_all(p);
@ -19920,7 +19927,7 @@ static char *sip_cli_notify(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
return CLI_FAILURE;
}
if (create_addr(p, a->argv[i], NULL, 1, NULL)) {
if (create_addr(p, a->argv[i], NULL, 1)) {
/* Maybe they're not registered, etc. */
dialog_unlink_all(p);
dialog_unref(p, "unref dialog inside for loop" );
@ -21421,6 +21428,9 @@ static void handle_response_subscribe(struct sip_pvt *p, int resp, const char *r
ast_debug(3, "Got 200 OK on subscription for MWI\n");
set_pvt_allowed_methods(p, req);
if (p->options) {
if (p->options->outboundproxy) {
ao2_ref(p->options->outboundproxy, -1);
}
ast_free(p->options);
p->options = NULL;
}
@ -25086,7 +25096,7 @@ static int sip_msg_send(const struct ast_msg *msg, const char *to, const char *f
sip_pvt_lock(pvt);
/* Look up the host to contact */
if (create_addr(pvt, to_host, NULL, TRUE, NULL)) {
if (create_addr(pvt, to_host, NULL, TRUE)) {
sip_pvt_unlock(pvt);
dialog_unlink_all(pvt);
dialog_unref(pvt, "create_addr failed sending a MESSAGE");
@ -27737,7 +27747,6 @@ static struct ast_channel *sip_request_call(const char *type, struct ast_format_
char dialstring[256];
char *remote_address;
enum sip_transport transport = 0;
struct ast_sockaddr remote_address_sa = { {0,} };
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(peerorhost);
AST_APP_ARG(exten);
@ -27845,15 +27854,9 @@ static struct ast_channel *sip_request_call(const char *type, struct ast_format_
}
if (!ast_strlen_zero(remote_address)) {
if (ast_sockaddr_resolve_first_transport(&remote_address_sa, remote_address, 0, transport)) {
ast_log(LOG_WARNING, "Unable to find IP address for host %s. We will not use this remote IP address\n", remote_address);
} else {
if (!ast_sockaddr_port(&remote_address_sa)) {
ast_sockaddr_set_port(&remote_address_sa,
transport & SIP_TRANSPORT_TLS ?
STANDARD_TLS_PORT :
STANDARD_SIP_PORT);
}
p->options->outboundproxy = proxy_from_config(remote_address, 0, NULL);
if (!p->options->outboundproxy) {
ast_log(LOG_WARNING, "Unable to parse outboundproxy %s. We will not use this remote IP address\n", remote_address);
}
}
@ -27864,7 +27867,7 @@ static struct ast_channel *sip_request_call(const char *type, struct ast_format_
ext = extension (user part of URI)
dnid = destination of the call (applies to the To: header)
*/
if (create_addr(p, host, NULL, 1, &remote_address_sa)) {
if (create_addr(p, host, NULL, 1)) {
*cause = AST_CAUSE_UNREGISTERED;
ast_debug(3, "Cant create SIP call - target device not registered\n");
dialog_unlink_all(p);

25
channels/sip/config_parser.c
Unescape View File

@ -652,14 +652,17 @@ int sip_parse_host(char *line, int lineno, char **hostname, int *portnum, enum s
if ((*hostname = strstr(line, "://"))) {
*hostname += 3;
if (!strncasecmp(line, "tcp", 3))
if (!strncasecmp(line, "tcp", 3)) {
*transport = SIP_TRANSPORT_TCP;
else if (!strncasecmp(line, "tls", 3))
} else if (!strncasecmp(line, "tls", 3)) {
*transport = SIP_TRANSPORT_TLS;
else if (!strncasecmp(line, "udp", 3))
} else if (!strncasecmp(line, "udp", 3)) {
*transport = SIP_TRANSPORT_UDP;
else
} else if (lineno) {
ast_log(LOG_NOTICE, "'%.3s' is not a valid transport type on line %d of sip.conf. defaulting to udp.\n", line, lineno);
} else {
ast_log(LOG_NOTICE, "'%.3s' is not a valid transport type in sip config. defaulting to udp.\n", line);
}
} else {
*hostname = line;
*transport = SIP_TRANSPORT_UDP;
@ -671,14 +674,22 @@ int sip_parse_host(char *line, int lineno, char **hostname, int *portnum, enum s
line = *hostname;
if (ast_sockaddr_split_hostport(line, hostname, &port, 0) == 0) {
ast_log(LOG_WARNING, "Cannot parse host '%s' on line %d of sip.conf.\n",
line, lineno);
if (lineno) {
ast_log(LOG_WARNING, "Cannot parse host '%s' on line %d of sip.conf.\n",
line, lineno);
} else {
ast_log(LOG_WARNING, "Cannot parse host '%s' in sip config.\n", line);
}
return -1;
}
if (port) {
if (!sscanf(port, "%5u", portnum)) {
ast_log(LOG_NOTICE, "'%s' is not a valid port number on line %d of sip.conf. using default.\n", port, lineno);
if (lineno) {
ast_log(LOG_NOTICE, "'%s' is not a valid port number on line %d of sip.conf. using default.\n", port, lineno);
} else {
ast_log(LOG_NOTICE, "'%s' is not a valid port number in sip config. using default.\n", port);
}
port = NULL;
}
}

1
channels/sip/include/sip.h
Unescape View File

@ -824,6 +824,7 @@ struct sip_invite_param {
enum sip_auth_type auth_type; /*!< Authentication type */
const char *replaces; /*!< Replaces header for call transfers */
int transfer; /*!< Flag - is this Invite part of a SIP transfer? (invite/replaces) */
struct sip_proxy *outboundproxy; /*!< Outbound proxy URI */
};
/*! \brief Structure to save routing information for a SIP session */

Write Preview
Loading…
Cancel
Save