diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-14 09:33:34 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-14 09:33:34 +0000 |
| commit | 028c4ab1ce0ed7d2bc13b178c96f3260a8877493 (patch) | |
| tree | ed8603371f11ab0f28c3797671624f3912f556e3 /channels | |
| parent | d10e8774eb81471696917381c2bd8b68f4ba53b4 (diff) | |
Merged revisions 148695 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r148695 | kpfleming | 2008-10-14 11:31:50 +0200 (Tue, 14 Oct 2008) | 1 line
ensure that *all* fields in the req structure are cleared out before reusing it; has_to_tag was not cleared, which caused the second incoming call over a TCP socket to fail if pedantic checking was enabled
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@148700 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index eb86a1e07..2fda99ca0 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -1,4 +1,4 @@ - /* +/* * Asterisk -- An open source telephony toolkit. * * Copyright (C) 1999 - 2006, Digium, Inc. @@ -2358,11 +2358,17 @@ static void *_sip_tcp_helper_thread(struct sip_pvt *pvt, struct ast_tcptls_sessi goto cleanup; for (;;) { + struct ast_str *str_save; + + str_save = req.data; + memset(&req, 0, sizeof(req)); + req.data = str_save; ast_str_reset(req.data); + + str_save = reqcpy.data; + memset(&reqcpy, 0, sizeof(reqcpy)); + reqcpy.data = str_save; ast_str_reset(reqcpy.data); - req.len = 0; - req.ignore = 0; - req.debug = 0; req.socket.fd = ser->fd; if (ser->ssl) { |