Commit Graph

2511 Commits

Author SHA1 Message Date
Joshua Colp
37c533bcf7 Merged revisions 183108 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r183108 | file | 2009-03-19 12:37:23 -0300 (Thu, 19 Mar 2009) | 11 lines
  
  Improve our triggering of a T38 switchover internally when triggered by a received reinvite.
  
  Previously we reached across the channel bridge to get the other party's SIP dialog
  structure in order to trigger an outgoing reinvite. This is extremely dangerous to do
  and only works if bridged to another SIP channel. This patch changes this to use the
  T38 control frame method of requesting a switchover. This change also causes the SIP
  channel driver to propogate back whether the switchover worked or not instead of blindly
  accepting the incoming T38 reinvite.
  
  Review: http://reviewboard.digium.com/r/200/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@183110 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-19 15:43:16 +00:00
Joshua Colp
90cf0f4c6e Merged revisions 182022 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r182022 | file | 2009-03-13 14:25:09 -0300 (Fri, 13 Mar 2009) | 7 lines
  
  Fix an issue with requesting a T38 reinvite before the call is answered.
  
  The code responsible for sending the T38 reinvite did not check if an INVITE was
  already being handled. This caused things to get confused and the call to fail.
  The code now defers sending the T38 reinvite until the current INVITE is done being
  handled.

  (issue AST-191)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@182042 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-13 17:29:26 +00:00
Kevin P. Fleming
65ed9947f7 Merged revisions 181985 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r181985 | kpfleming | 2009-03-13 11:55:38 -0500 (Fri, 13 Mar 2009) | 1 line
  
  improve a bit of suboptimal code
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@181987 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-13 16:58:00 +00:00
Mark Michelson
6dd8307b7f Merged revisions 181769 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r181769 | mmichelson | 2009-03-12 13:30:58 -0500 (Thu, 12 Mar 2009) | 28 lines
  
  Merged revisions 181768 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r181768 | mmichelson | 2009-03-12 13:29:48 -0500 (Thu, 12 Mar 2009) | 22 lines
    
    Properly send a 487 on an INVITE we have not responded to if we receive a BYE.
    
    If we receive an INVITE from an endpoint and then later receive a BYE from that
    same endpoint before we have sent a final response for the INVITE, then we need
    to respond to the INVITE with a 487. 
    
    There was logic in the code prior to this commit which seemed to exist solely to 
    handle this situation, but there was one condition in an if statement which 
    was incorrect. The only way we would send a 487 was if the sip_pvt had no owner
    channel. This made no sense since we created the owner channel when we received
    the INVITE, meaning that the majority of the time we would never send the 487.
    The 487 being sent should not rely on whether we have created a channel. Its
    delivery should be dependent on the current state of the initial INVITE transaction.
    With this commit, that logic is now correctly in place.
    
    (closes issue #14149)
    Reported by: legranjl
    Patches:
          14149.patch uploaded by mmichelson (license 60)
    Tested by: legranjl
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@181771 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-12 18:36:34 +00:00
Joshua Colp
a58f23f79a Merged revisions 181345 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r181345 | file | 2009-03-11 14:26:40 -0300 (Wed, 11 Mar 2009) | 21 lines
  
  Merged revisions 181328 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r181328 | file | 2009-03-11 14:22:52 -0300 (Wed, 11 Mar 2009) | 14 lines
    
    Fix issue where an attended transfer could not be completed under a rare scenario.
    
    When completing an attended transfer chan_sip does a check to make sure the extension
    in the URI portion of the Refer-To header is a local valid extension. We don't actually
    need to check this since we know for sure the other channel is already up and talking to
    the extension. Some devices do not put the extension in the Refer-To header either, which
    can cause the extension check to fail. We now no longer do this check if it is an attended
    transfer.
    
    (closes issue #14628)
    Reported by: sverre
    Patches:
          14628.diff uploaded by file (license 11)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@181359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-11 17:29:45 +00:00
Joshua Colp
75c9cd1128 Merged revisions 181296 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r181296 | file | 2009-03-11 13:40:48 -0300 (Wed, 11 Mar 2009) | 16 lines
  
  Merged revisions 181295 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r181295 | file | 2009-03-11 13:36:50 -0300 (Wed, 11 Mar 2009) | 9 lines
    
    Fix a problem with inband DTMF detection on outgoing SIP calls when dtmfmode=auto.
    
    When dtmfmode was set to auto the inband DTMF detector was not setup
    on outgoing SIP calls. This caused inband DTMF detection to fail.
    The inband DTMF detector is now setup for both dtmfmode inband and auto.
    
    (closes issue #13713)
    Reported by: makoto
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@181298 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-11 16:43:51 +00:00
Jeff Peeler
efc87a9c86 Merged revisions 181135 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r181135 | jpeeler | 2009-03-10 23:06:44 -0500 (Tue, 10 Mar 2009) | 20 lines
  
  Fix malloc debug macros to work properly with h323.
  
  The main problem here was that cstdlib was undefining free thereby causing the
  proper debug macros to not be used. ast_h323.cxx has been changed to call
  ast_free instead to avoid the issue. 
  
  A few other issues were addressed:
  - There were a few instances of functions improperly passing ast_free instead
  of ast_free_ptr.
  - Some clean up was done to avoid the debug macros intentionally being redefined.
  (copied below from Kevin's commit, appreciate the help)
  - disable astmm.h from doing anything when STANDALONE is defined, which is used
  by the tools in the utils/ directory that use parts of Asterisk header files in
  hackish ways; also ensure that utils/extconf.c and utils/conf2ael.c are
  compiled with STANDALONE defined.
  
  (closes issue #13593)
  Reported by: pj
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@181199 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-11 04:33:29 +00:00
Mark Michelson
23e19b9227 Merged revisions 181032-181033 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r181032 | mmichelson | 2009-03-10 19:46:47 -0500 (Tue, 10 Mar 2009) | 19 lines
  
  Merged revisions 181029,181031 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r181029 | mmichelson | 2009-03-10 19:30:26 -0500 (Tue, 10 Mar 2009) | 9 lines
    
    Fix incorrect tag checking on transfers when pedantic=yes is enabled.
    
    (closes issue #14611)
    Reported by: klaus3000
    Patches:
          patch_chan_sip_attended_transfer_1.4.23.txt uploaded by klaus3000 (license 65)
    Tested by: klaus3000
  ........
    r181031 | mmichelson | 2009-03-10 19:32:40 -0500 (Tue, 10 Mar 2009) | 3 lines
    
    Remove unused variables.
  ........
................
  r181033 | mmichelson | 2009-03-10 19:49:00 -0500 (Tue, 10 Mar 2009) | 3 lines
  
  Add missing comment that quotes RFC 3891
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@181035 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-11 01:04:04 +00:00
Russell Bryant
49b3688d42 Merged revisions 180261 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r180261 | russell | 2009-03-04 15:01:05 -0600 (Wed, 04 Mar 2009) | 54 lines

Resolve object matching issues related to the removal of the sip_user object.

Previously, chan_sip had both sip_peer and sip_user objects in memory.  A
patch went in to remove sip_user to simplify the code, since everything
could be done with just sip_peer.  This patch resolves some regressions
found that were introduced by those changes.

This code comes from svn/asterisk/team/group/sip-object-matching/.

Here is a list of the changes that have been made:

1) When doing a match by name with the find_peer() function, make it much
   easier to specify which objects should be matched by having a parameter
   that specifies exactly which object types should be considered.  Also,
   update find_by_name() to handle this parameter.  Finally, update all
   code to use the new option values.

2) When looking up an object for an outbound request by name, consider
   peers only.  (create_addr())

3) Only match peers on an incoming registration request.

4) When doing authentication (except for SUBSCRIBE), look up users
   by name, instead of all objects by name.
   
5) When doing authentication (except for SUBSCRIBE), after looking for
   a user by name, look for a peer by IP address, instead of all objects
   by IP address.

6) When handling the SIP qualify CLI command or manager action, look for
   a peer by name, instead of any object by name.

7) When handling the SIP unregister CLI command, look for a peer by name,
   instead of any object by name.

9) In sip_do_debug_peer(), search for a peer by name, instead of any object
   by name.

9) When handling the SIPPEER() dialplan function, search for a peer by name,
   instead of any object by name.

10) In the following session timer related functions, st_get_se(),
    st_get_refresher(), and st_get_mode(), when looking for an object for a
    given sip_pvt using pvt->peername, look for a peer by name, instead of any
    object by name.

11) Fix build_peer() to properly handle the case where separate type=peer and
    type=user entries were specified in sip.conf.

(closes issue #14505)
Reported by: lmadsen

Review: http://reviewboard.digium.com/r/172/

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@180263 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-04 21:09:13 +00:00
Mark Michelson
22e08ba056 Merged revisions 179219 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r179219 | mmichelson | 2009-03-01 15:45:08 -0600 (Sun, 01 Mar 2009) | 18 lines
  
  Properly free memory and remove scheduler entries when a transmission failure occurs.
  
  Previously, only the "data" field of the sip_pkt created during __sip_reliable_xmit 
  was freed when XMIT_ERROR was returned by __sip_xmit. When retrans_pkt was called,
  this inevitably resulted in the reading and writing of freed memory.
  
  XMIT_ERROR is a condition meaning that we don't want to attempt resending the packet
  at all. The proper action to take is to remove the scheduler entry we just created,
  free the packet's data as well as the packet itself, and unlink it from the list of
  packets on the sip_pvt structure.
  
  (closes issue #14455)
  Reported by: Nick_Lewis
  Patches:
        14455.patch uploaded by mmichelson (license 60)
  Tested by: Nick_Lewis
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@179221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-01 21:57:18 +00:00
Joshua Colp
69602d500a Merged revisions 178213 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r178213 | file | 2009-02-24 11:18:38 -0400 (Tue, 24 Feb 2009) | 16 lines
  
  Merged revisions 178205 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r178205 | file | 2009-02-24 11:16:07 -0400 (Tue, 24 Feb 2009) | 9 lines
    
    Skip check for extension when subscribing for MWI.
    
    Since the remote side is not actually subscribing to a specific extension when
    subscribing for MWI just skip the check to see if the extension exists. They can't use it
    to specify the mailbox either since we require configuration of that in sip.conf
    
    (closes issue #14531)
    Reported by: festr
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@178232 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-24 15:22:25 +00:00
Tilghman Lesher
23111db55e Merged revisions 177944 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r177944 | tilghman | 2009-02-21 09:59:49 -0600 (Sat, 21 Feb 2009) | 2 lines
  
  On update, test against the existence of sipregs.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@177945 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-21 16:04:09 +00:00
Michiel van Baak
7c7f6266fa Merged revisions 177849 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r177849 | mvanbaak | 2009-02-21 13:22:32 +0100 (Sat, 21 Feb 2009) | 2 lines
  
  make chan_sip.c compile on OpenBSD again.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@177851 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-21 12:51:33 +00:00
Jeff Peeler
765b86befa Merged revisions 177624 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r177624 | jpeeler | 2009-02-19 18:35:53 -0600 (Thu, 19 Feb 2009) | 7 lines
  
  Set sip_request ast_str data to NULL so ast_str_copy allocates space properly
  in copy_request
  
  (issue #14478)
  Reported by: erik_dedecker
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@177626 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-20 00:38:19 +00:00
Joshua Colp
f08c2a683b Merged revisions 177005 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r177005 | file | 2009-02-18 13:11:52 -0400 (Wed, 18 Feb 2009) | 6 lines
  
  Fix ordering of output for a ChannelUpdate manager event.
  (closes issue #14497)
  Reported by: vinsik
  Patches:
        chan_update_fix-chan_sip.c.diff uploaded by vinsik (license 623)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@177007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-18 17:14:16 +00:00
Dwayne M. Hubbard
e51c85db06 Merged revisions 176705 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r176705 | dhubbard | 2009-02-17 15:59:38 -0600 (Tue, 17 Feb 2009) | 11 lines
  
  create a UDPTL structure in create_addr_from_peer() if it does not already exist for T38
  
  This is required to create a UDPTL structure in create_addr_from_peer() to handle the
  scenario where 't38pt_udptl=yes' is not defined in the [general] section of sip.conf but 
  is defined the peer's context.  I tested this patch by enabling t38pt_udptl in the 
  [general] section on one system and only enabling t38pt_udptl in a peer's context on
  the system sending a fax.  Without the patch, the sending system will fail to initiate
  T38 negotiation with the warning message, "No way to add SDP without an UDPTL structure".
  When this patch is applied the sending side will successfully initiate T38 negotiation.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@176731 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-17 22:21:59 +00:00
Tilghman Lesher
19515dc39f Merged revisions 176501 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r176501 | tilghman | 2009-02-17 08:39:36 -0600 (Tue, 17 Feb 2009) | 3 lines
  
  In this version, we can combine the queries, because we support dropping
  nonexistent columns.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@176503 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-17 14:48:01 +00:00
Tilghman Lesher
e97be790c0 Merged revisions 176459 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r176459 | tilghman | 2009-02-16 19:58:39 -0600 (Mon, 16 Feb 2009) | 17 lines
  
  Merged revisions 176426 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r176426 | tilghman | 2009-02-16 18:49:22 -0600 (Mon, 16 Feb 2009) | 10 lines
    
    After a 'sip reload', qualifies for realtime peers weren't immediately
    restarted, instead waiting until the next registration.  We're now
    caching the qualify across a reload/restart and starting the qualify
    immediately upon loading the peer.
    (closes issue #14196)
     Reported by: pdf
     Patches: 
           20090120__bug14196_1.4.diff.txt uploaded by pdf (license 663)
     Tested by: pdf
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@176461 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-17 02:07:18 +00:00
Joshua Colp
800c99a36c Merged revisions 176030 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r176030 | file | 2009-02-16 11:36:19 -0400 (Mon, 16 Feb 2009) | 16 lines
  
  Merged revisions 176029 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r176029 | file | 2009-02-16 11:33:53 -0400 (Mon, 16 Feb 2009) | 9 lines
    
    Don't have the Via header stored as a stringfield as it can change often during the lifetime of a dialog.
    
    This issue crept up with subscriptions on the AA50. When an outgoing NOTIFY is sent a new branch value
    is created and the Via header is changed to reflect it. Since this was a stringfield a new spot in the
    pool was used for the value while the old was left untouched/unused. If the current pool was full a new
    pool was created. This would cause memory usage to increase steadily.
    
    (issue #AA50-2332)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@176032 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-16 15:38:20 +00:00
Michiel van Baak
9dab42b819 Merged revisions 175952 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r175952 | mvanbaak | 2009-02-16 01:26:59 +0100 (Mon, 16 Feb 2009) | 10 lines
  
  Merged revisions 175921 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r175921 | mvanbaak | 2009-02-16 00:37:03 +0100 (Mon, 16 Feb 2009) | 3 lines
    
    fix mis-spelling of the word registered.
    Reported by De_Mon on #asterisk-dev.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@176023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-16 09:42:46 +00:00
Russell Bryant
3e2b976fc0 Merged revisions 175829 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r175829 | russell | 2009-02-15 14:56:27 -0600 (Sun, 15 Feb 2009) | 14 lines

Fix a number of problems with ast_sched_report().

1) It had numerous coding guidelines violations with regards to formatting.

2) It allocated memory using ast_calloc() that was never freed.

3) It didn't check for failure from the allocation.

4) It used sprintf() and strcat() to build the result, doing zero checking to
   prevent writing past the end of the provided buffer.

The function also lacks API documentation, but that has not been addressed in
this commit.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@175831 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-15 21:00:58 +00:00
Russell Bryant
30e5135fec Merged revisions 175368 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r175368 | russell | 2009-02-12 15:41:01 -0600 (Thu, 12 Feb 2009) | 2 lines

Remove useless string copy, and make sscanf safe again

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@175370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-12 21:41:36 +00:00
Russell Bryant
b792800b01 Merged revisions 175295 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r175295 | russell | 2009-02-12 14:45:47 -0600 (Thu, 12 Feb 2009) | 2 lines

Avoid using ast_strdupa() in a loop.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@175297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-12 20:48:13 +00:00
Joshua Colp
8fc9ea25ab Merged revisions 174710 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r174710 | file | 2009-02-10 16:15:43 -0400 (Tue, 10 Feb 2009) | 4 lines
  
  Only decrease inringing count if above zero.
  (issue #13238)
  Reported by: kowalma
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@174714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-10 20:17:43 +00:00
Joshua Colp
d14fe9fcee Merged revisions 174580 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r174580 | file | 2009-02-10 13:48:29 -0400 (Tue, 10 Feb 2009) | 4 lines
  
  Set the type for the peer structure to be a peer as the default.
  (closes issue #14447)
  Reported by: triccyx
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@174582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-10 17:49:45 +00:00
Joshua Colp
5ed074591b Merged revisions 174543 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r174543 | file | 2009-02-10 11:37:07 -0400 (Tue, 10 Feb 2009) | 6 lines
  
  Make the logic for inuse and inringing manipluation match that of 1.4. The old broken logic would reset the values back to 0 during certain scenarios causing the wrong state to be reported.
  (closes issue #14399)
  Reported by: caspy
  (issue #13238)
  Reported by: kowalma
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@174545 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-10 15:39:53 +00:00
Mark Michelson
1e4f1aff0c Merged revisions 174327 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r174327 | mmichelson | 2009-02-09 11:27:32 -0600 (Mon, 09 Feb 2009) | 3 lines

Fix something I messed up in the merge I just did


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@174329 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-09 17:30:33 +00:00
Mark Michelson
b9b73e763b Merged revisions 174301 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r174301 | mmichelson | 2009-02-09 11:20:55 -0600 (Mon, 09 Feb 2009) | 20 lines

Merged revisions 174282 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r174282 | mmichelson | 2009-02-09 11:11:05 -0600 (Mon, 09 Feb 2009) | 12 lines

Don't do an SRV lookup if a port is specified

RFC 3263 says to do A record lookups on a hostname
if a port has been specified, so that's what we're
going to do. See section 4.2.

(closes issue #14419)
Reported by: klaus3000
Patches:
      patch_chan_sip_nosrvifport_1.4.23.txt uploaded by klaus3000 (license 65)


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@174326 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-09 17:26:39 +00:00
Dwayne M. Hubbard
697dd6060d Merged revisions 174084 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r174084 | dhubbard | 2009-02-06 17:51:56 -0600 (Fri, 06 Feb 2009) | 13 lines

Merged revisions 174082 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r174082 | dhubbard | 2009-02-06 17:36:03 -0600 (Fri, 06 Feb 2009) | 5 lines

check ast_strlen_zero() before calling ast_strdupa() in sip_uri_headers_cmp()
and sip_uri_params_cmp()

The reporter didn't actually upload a properly-formed patch, instead a 
modified chan_sip.c file was uploaded.  I created a patch to determine the
changes, then modified the suggested changes to create a proper fix.  The
summary above is a complete description of the changes.

(closes issue #13547)
Reported by: tecnoxarxa
Patches:
      chan_sip.c.gz uploaded by tecnoxarxa (license 258)
Tested by: tecnoxarxa

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@174086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-07 00:09:08 +00:00
Joshua Colp
38e93d7b01 Merged revisions 173974 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r173974 | file | 2009-02-06 13:18:35 -0400 (Fri, 06 Feb 2009) | 15 lines
  
  Merged revisions 173967-173968 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r173967 | file | 2009-02-06 13:14:15 -0400 (Fri, 06 Feb 2009) | 4 lines
    
    Some clients do not put the call-id for replaces at the beginning, so support it being anywhere in the string.
    (closes issue #14350)
    Reported by: fhackenberger
  ........
    r173968 | file | 2009-02-06 13:15:01 -0400 (Fri, 06 Feb 2009) | 2 lines
    
    Remove a debug message I put in by accident.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173994 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-06 17:22:56 +00:00
Matthew Nicholson
e414d0d27d Merged revisions 173952 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r173952 | mnicholson | 2009-02-06 10:28:19 -0600 (Fri, 06 Feb 2009) | 14 lines
  
  Merged revisions 173917 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r173917 | mnicholson | 2009-02-06 10:20:23 -0600 (Fri, 06 Feb 2009) | 7 lines
    
    Limit the addition of the Contact header in SIP responses according to various
    SIP RFCs.
    
    (closes issue #13602)
    Reported by: hjourdain
    Tested by: mnicholson
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173966 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-06 17:05:05 +00:00
Matthew Nicholson
af64f9e802 revert revision 173964
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173965 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-06 17:04:04 +00:00
Matthew Nicholson
0cff12dd4b Merged revisions 173952 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r173952 | mnicholson | 2009-02-06 10:28:19 -0600 (Fri, 06 Feb 2009) | 14 lines
  
  Merged revisions 173917 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r173917 | mnicholson | 2009-02-06 10:20:23 -0600 (Fri, 06 Feb 2009) | 7 lines
    
    Limit the addition of the Contact header in SIP responses according to various
    SIP RFCs.
    
    (closes issue #13602)
    Reported by: hjourdain
    Tested by: mnicholson
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173964 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-06 16:39:21 +00:00
Olle Johansson
3c4e4a8355 Merged revisions 172234 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r172234 | oej | 2009-01-29 12:19:29 +0100 (Tor, 29 Jan 2009) | 7 lines

Make sure register= line supports both port and expiry at the same time.
(closes issue #14185)
Reported by: Nick_Lewis
Patches: 
      chan_sip.c-expiryrequest6.patch uploaded by Nick (license 657)
Tested by: Nick_Lewis

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172235 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-29 11:24:30 +00:00
Olle Johansson
815b9b5691 Merged revisions 172173 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r172173 | oej | 2009-01-29 10:18:01 +0100 (Tor, 29 Jan 2009) | 24 lines

Merged revisions 172169 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r172169 | oej | 2009-01-29 09:48:18 +0100 (Tor, 29 Jan 2009) | 16 lines

Make sure that we always add the hangupcause headers. In some cases, the owner was disconnected before we checked for the cause.
This patch implements a temporary storage in the pvt and use that instead.

The code is based on ideas from code from Adomjan in issue #13385 (Add support for Reason: header)
Thanks to Klaus Darillion for testing!

(closes issue #14294)
related to issue #13385

Reported by: klaus3000 and adomjan
Patches: 
      bug14294b.diff uploaded by oej (license 306)
      Based on 20080829_chan_sip.c-q850reason_header.patch uploaded by adomjan (license 487)
Tested by: oej, klaus3000


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172231 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-29 10:36:28 +00:00
Olle Johansson
a68cd825fe Merged revisions 171528 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r171528 | oej | 2009-01-27 16:00:19 +0100 (Tis, 27 Jan 2009) | 23 lines

Solving the same issue, but a bit different in trunk...

Merged revisions 171527 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r171527 | oej | 2009-01-27 15:33:20 +0100 (Tis, 27 Jan 2009) | 13 lines

Use the same branch tag in CANCEL as in INVITE

Originally putnopvut implemented some changes in revision 142079 that according to the bug report seemed to have worked then, but somehow fails now.
I guess code, as humans, get old and forget stuff. Anyway, this bug caused CANCEL not to work with picky systems. 

Thanks Fredrik for pointing out where the bug in the SIP messaging was.

(closes issue #14346)
Reported by: oej
Patches: 
      bug14346.diff uploaded by oej (license 306)
Tested by: oej

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@171540 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-27 15:19:52 +00:00
Olle Johansson
7481ad589a Merged revisions 171326 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r171326 | oej | 2009-01-26 14:44:40 +0100 (MÃ¥n, 26 Jan 2009) | 17 lines

Merged revisions 171264 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r171264 | oej | 2009-01-26 13:51:53 +0100 (MÃ¥n, 26 Jan 2009) | 9 lines

Don't retransmit 401 on REGISTER requests when alwaysauthreject=yes

(closes issue #14284)
Reported by: klaus3000
Patches: 
      patch_chan_sip_unreliable_1.4.23_14284.txt uploaded by klaus3000 (license 65)
Tested by: klaus3000


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@171361 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-26 14:58:04 +00:00
Joshua Colp
85f8608a8e Merged revisions 170505 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r170505 | file | 2009-01-23 14:09:45 -0400 (Fri, 23 Jan 2009) | 11 lines
  
  Merged revisions 170504 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r170504 | file | 2009-01-23 14:04:08 -0400 (Fri, 23 Jan 2009) | 4 lines
    
    Use the on hold flag to see if the call is on hold or not. It is possible that our address for them will still be valid even though they are on hold.
    (closes issue #14295)
    Reported by: klaus3000
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170507 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 18:11:35 +00:00
Mark Michelson
b7799bc31a Merged revisions 169791 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r169791 | mmichelson | 2009-01-21 15:53:55 -0600 (Wed, 21 Jan 2009) | 18 lines

Further fix some oddities in sip show users and sip show peers logic

ccesario on IRC pointed out that his sip peers were not displayed
properly when he would issue the command "sip show peers." The problem
was that the onlymatchonip field was used to determine if the endpoint
was a "peer" or "user." The tricky part is that a "friend" is supposed
to be treated as both a "user" and a "peer" but the logic would not allow
"friends" to show up as "peers" since onlymatchonip was set to FALSE
for friends.

I have modified the sip_peer structure to more explicitly keep track of
what type endpoint it is so that the various manager and CLI commands
will display the expected information

Reported by ccesario via IRC
Tested by ccesario


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@169792 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-21 21:57:33 +00:00
Mark Michelson
3a69dbe8cc Merged revisions 169557 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r169557 | mmichelson | 2009-01-20 14:10:31 -0600 (Tue, 20 Jan 2009) | 19 lines

Convert the character pointers in a sip_request to be pointer offsets

When an ast_str expands to hold more data, any pointers that were pointing
to the data prior to the expansion will be pointing at invalid memory. This
change makes such pointers used in chan_sip.c instead be offsets from the
beginning of the string so that the same math may be applied no matter where
in memory the string resides.

To help ease this transition, a macro called REQ_OFFSET_TO_STR has been added
to chan_sip.c so that given a sip_request and an offset, the string at that
offset is returned.

(closes issue #14220)
Reported by: riksta
Tested by: putnopvut

Review http://reviewboard.digium.com/r/126/


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@169559 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-20 20:15:50 +00:00
Terry Wilson
eb427ada5e Merged revisions 169044 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r169044 | twilson | 2009-01-16 18:03:39 -0600 (Fri, 16 Jan 2009) | 8 lines
  
  Fix port :0 added to SIP INVITE URI when outboundproxy used
  
  (closes issue #14233)
  Reported by: chris-mac
  Patches: 
        asterisk-bug14233.diff.txt uploaded by jamesgolovich (license 176)
  Tested by: jamesgolovich, chris-mac, otherwiseguy
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@169079 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-17 00:32:56 +00:00
Mark Michelson
382e0d37be Merged revisions 168976 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r168976 | mmichelson | 2009-01-16 16:43:09 -0600 (Fri, 16 Jan 2009) | 26 lines

Merged revisions 168975 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r168975 | mmichelson | 2009-01-16 16:42:13 -0600 (Fri, 16 Jan 2009) | 18 lines

Account for possible NULL pointer when we receive a 408 in response to a REGISTER

It may be that by the time we receive a reply to a REGISTER request, the attempt has
timed out and thus the registry structure pointed to by the corresponding sip_pvt has
gone away. This situation was handled properly for a 200 OK response, but the 408
case assumed that the sip_registry struct was non-NULL, thus potentially causing a crash

This commit fixes this assumption and prints out a message to the console if we should
receive a late 408 response to a REGISTER


(closes issue #14211)
Reported by: aborghi
Patches:
      14211.diff uploaded by putnopvut (license 60)
Tested by: aborghi


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@168979 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-16 22:46:33 +00:00
Mark Michelson
31749d07fa Merged revisions 168728 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r168728 | mmichelson | 2009-01-15 13:16:29 -0600 (Thu, 15 Jan 2009) | 3 lines

Fix the compactheaders option in sip.conf


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@168729 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-15 19:17:43 +00:00
Mark Michelson
33ad5ed729 Merged revisions 168725 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r168725 | mmichelson | 2009-01-15 13:00:06 -0600 (Thu, 15 Jan 2009) | 17 lines

Remove an unneeded condition for line addition to a SIP request/response

In Asterisk 1.4 and 1.6.0, the sip_request structure had a statically
allocated buffer to hold the text of the request. There was a check in the
add_line function to not attempt to write the line into the buffer if we
did not have room for it.

In trunk and Asterisk versions starting with 1.6.1, an expandable ast_str
structure is used to hold the text. Since it may grow to fit an arbitrarily
sized string, this check in add_line is no longer valid.

I found this oddity while attempting to fix issue #14220; however, I do not
believe that this is the fix for that issue since the output supplied by the
reporter did not contain the warning message that would be printed had this
condition been satisfied.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@168726 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-15 19:00:52 +00:00
Olle Johansson
ea715d8f7f Merged revisions 168712 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r168712 | oej | 2009-01-15 19:08:59 +0100 (Tor, 15 Jan 2009) | 3 lines

Make sure that we have the same terminology in sip.conf.sample and the source code warning.
Thanks Nick Lewis for pointing this out in the bug tracker.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@168714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-15 18:18:34 +00:00
Mark Michelson
e31bbaea8b Merged revisions 168610 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r168610 | mmichelson | 2009-01-14 14:13:48 -0600 (Wed, 14 Jan 2009) | 9 lines

Restore the "sip show users" and "sip show user" CLI commands

(closes issue #14180)
Reported by: amorsen
Patches:
      sip_show_users_161v3.diff uploaded by putnopvut (license 60)
Tested by: blitzrage, amorsen


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@168611 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-14 20:18:55 +00:00
Terry Wilson
af9322a5bf Merged revisions 168578 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168578 | twilson | 2009-01-13 16:22:34 -0600 (Tue, 13 Jan 2009) | 14 lines
  
  Merged revisions 168551 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r168551 | twilson | 2009-01-13 12:34:14 -0600 (Tue, 13 Jan 2009) | 7 lines
    
    Don't pass a value with a side effect to a macro
    
    (closes issue #14176)
    Reported by: paraeco
    Patches: 
          chan_sip.c.diff uploaded by paraeco (license 658)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@168582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-13 22:38:21 +00:00
Mark Michelson
45340d2526 Merged revisions 168486 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@168488 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-12 15:05:43 +00:00
Tilghman Lesher
02dd0d784f Merged revisions 168334 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r168334 | tilghman | 2009-01-09 19:42:45 -0600 (Fri, 09 Jan 2009) | 2 lines
  
  sizeof for a stringfield is 4.  Kinda low for reconstructing a field value.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@168336 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-10 01:44:33 +00:00
Mark Michelson
4736407e8d Merged revisions 168193 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r168193 | mmichelson | 2009-01-09 15:53:26 -0600 (Fri, 09 Jan 2009) | 21 lines

Merged revisions 168128 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r168128 | mmichelson | 2009-01-09 14:08:04 -0600 (Fri, 09 Jan 2009) | 13 lines

Add check_via calls to more request handlers

INFO, NOTIFY, OPTIONS, REFER, and MESSAGE requests
were not checking the topmost Via to determine where
to send the response. Adding check_via calls to those
request handlers solves this.

(closes issue #13071)
Reported by: baron
Patches:
      check_via.patch uploaded by baron (license 531)
Tested by: baron

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@168196 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-09 21:57:46 +00:00