From: David Vossel Date: Tue, 17 Aug 2010 21:37:46 +0000 (+0000) Subject: Merged revisions 282577 via svnmerge from X-Git-Tag: 11.0.0-beta1~2450 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f283b0a61a882e053957d4d481aee5b6d56a2508;p=thirdparty%2Fasterisk.git Merged revisions 282577 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r282577 | dvossel | 2010-08-17 16:36:57 -0500 (Tue, 17 Aug 2010) | 16 lines Merged revisions 282576 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r282576 | dvossel | 2010-08-17 16:35:17 -0500 (Tue, 17 Aug 2010) | 9 lines fixes no default transport for temp peer creation in chan_sip (closes issue #17829) Reported by: falves11 Patches: issue_17829.rev1.txt uploaded by russell (license 2) issue_17829.diff uploaded by dvossel (license 671) Tested by: falves11 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282578 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index e6773b895e..db1837ac8d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -25401,6 +25401,8 @@ static void set_peer_defaults(struct sip_peer *peer) peer->timer_b = global_timer_b; clear_peer_mailboxes(peer); peer->disallowed_methods = sip_cfg.disallowed_methods; + peer->transports = default_transports; + peer->default_outbound_transport = default_primary_transport; } /*! \brief Create temporary peer (used in autocreatepeer mode) */ @@ -25555,6 +25557,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str /* If we have realm authentication information, remove them (reload) */ clear_realm_authentication(peer->auth); peer->auth = NULL; + /* clear the transport information. We will detect if a default value is required after parsing the config */ peer->default_outbound_transport = 0; peer->transports = 0;