diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-11 16:05:29 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-11 16:05:29 +0000 |
| commit | 3e061731b5b4c362401d319e6855bf7b2b8f4162 (patch) | |
| tree | a122e13d46a53360841d23b95043286359f893a8 | |
| parent | 1ce3d454b67db0af90e402e1b59ab66e1709f174 (diff) | |
Merged revisions 61476 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r61476 | russell | 2007-04-11 11:01:25 -0500 (Wed, 11 Apr 2007) | 5 lines
If someone sets the "useragent" option in sip.conf to be empty, then don't add
the User-Agent header at all. It is an optional header, anyway. Also, the bug
report says that some of Japan's SIP providers don't allow it for some weird
reason. (issue #9488, reported by makoto, fixed by me)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@61477 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 151e135ed..fcdee0c6f 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5596,7 +5596,8 @@ static int respprep(struct sip_request *resp, struct sip_pvt *p, const char *msg add_header(resp, "To", ot); copy_header(resp, req, "Call-ID"); copy_header(resp, req, "CSeq"); - add_header(resp, "User-Agent", global_useragent); + if (!ast_strlen_zero(global_useragent)) + add_header(resp, "User-Agent", global_useragent); add_header(resp, "Allow", ALLOWED_METHODS); add_header(resp, "Supported", SUPPORTED_EXTENSIONS); if (msg[0] == '2' && (p->method == SIP_SUBSCRIBE || p->method == SIP_REGISTER)) { @@ -5711,7 +5712,8 @@ static int reqprep(struct sip_request *req, struct sip_pvt *p, int sipmethod, in copy_header(req, orig, "Call-ID"); add_header(req, "CSeq", tmp); - add_header(req, "User-Agent", global_useragent); + if (!ast_strlen_zero(global_useragent)) + add_header(req, "User-Agent", global_useragent); add_header(req, "Max-Forwards", DEFAULT_MAX_FORWARDS); if (!ast_strlen_zero(p->rpid)) @@ -6755,7 +6757,8 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho add_header(req, "Contact", p->our_contact); add_header(req, "Call-ID", p->callid); add_header(req, "CSeq", tmp); - add_header(req, "User-Agent", global_useragent); + if (!ast_strlen_zero(global_useragent)) + add_header(req, "User-Agent", global_useragent); add_header(req, "Max-Forwards", DEFAULT_MAX_FORWARDS); if (!ast_strlen_zero(p->rpid)) add_header(req, "Remote-Party-ID", p->rpid); @@ -7343,7 +7346,8 @@ static int transmit_register(struct sip_registry *r, int sipmethod, const char * add_header(&req, "To", to); add_header(&req, "Call-ID", p->callid); add_header(&req, "CSeq", tmp); - add_header(&req, "User-Agent", global_useragent); + if (!ast_strlen_zero(global_useragent)) + add_header(&req, "User-Agent", global_useragent); add_header(&req, "Max-Forwards", DEFAULT_MAX_FORWARDS); |