reverses incorrect logic introduced by r243200
authorDavid Vossel <dvossel@digium.com>
Mon, 24 May 2010 19:42:54 +0000 (19:42 +0000)
committerDavid Vossel <dvossel@digium.com>
Mon, 24 May 2010 19:42:54 +0000 (19:42 +0000)
The decoding of the replace_id did not need to be broken
up in this instance.  This was brought to my attention
again because it caused a segfault when the from or to
tags were not present in the "Replaces" header.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@265366 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index 9f34fff..e3a79fb 100644 (file)
@@ -20336,6 +20336,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
                        ast_debug(3, "INVITE part of call transfer. Replaces [%s]\n", p_replaces);
                /* Create a buffer we can manipulate */
                replace_id = ast_strdupa(p_replaces);
+               ast_uri_decode(replace_id);
 
                if (!p->refer && !sip_refer_allocate(p)) {
                        transmit_response_reliable(p, "500 Server Internal Error", req);
@@ -20368,10 +20369,6 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
                        }
                }
 
-               ast_uri_decode(fromtag);
-               ast_uri_decode(totag);
-               ast_uri_decode(replace_id);
-
                if (sipdebug)
                        ast_debug(4, "Invite/replaces: Will use Replace-Call-ID : %s Fromtag: %s Totag: %s\n",
                                          replace_id,