Commit Graph

1624 Commits

Author SHA1 Message Date
Russell Bryant
1ccfa50ba8 Fix more "set but unused" warnings.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@317474 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 22:36:33 +00:00
Russell Bryant
a82f1bb995 Fix a bunch of compiler warnings generated by gcc 4.6.0.
Most of these are -Wunused-but-set-variable, but there were a few others
mixed in here, as well.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@316265 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-03 19:55:49 +00:00
David Vossel
220bfc6746 Fixes a random crash (NULL reference) in res_odbc.c.
(closes issue #19180)
Reported by: pruiz
Patches: 
      tmp.diff uploaded by pruiz (license 1152)
Tested by: pruiz, seanbright



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@316215 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-03 18:49:48 +00:00
Russell Bryant
cceef6ee30 Merged revisions 314778 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r314778 | russell | 2011-04-22 08:58:03 -0500 (Fri, 22 Apr 2011) | 11 lines
  
  Initialize buffers in getvar and getvarfull.
  
  Initialize the buffers used to hold the result from GET VARIABLE or
  GET VARIABLE FULL.  The bug report shows func_read returning garbage in
  the result.  It assumed that the buffer passed in was initialized, like many
  other functions do.  In the more common code path (through the dialplan), it
  is initialized, so just initialize it here too.
  
  (closes issue #19050)
  Reported by: johnz
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@314780 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-22 14:02:23 +00:00
Tzafrir Cohen
51be3664e1 Fix a few typos (shown by Lintian)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@314779 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-22 13:59:43 +00:00
Richard Mudgett
c4d972a941 The AsyncAGI command loop is lax in the value it returns for the return status.
* Return correct status: SUCCESS/FAILED/HANGUP.  Previously, abnormal
exits from the command loop such as hangup would return SUCCESS.

* The "asyncagi break" command now returns SUCCESS and is now the only way
to break the command loop with that status.  Previously, it returned
FAILED.

* The AMI event AsyncAGI End is no longer sent if the AsyncAGI Start event
is not sent.  Previously, this happened because of an error setting up the
AGI pipes.

* All executed AGI commands now get an AsyncAGI Exec result event.
Previously, if the command returned failure (because of hangup), the
command loop just exited with FAILURE and did not send the AsyncAGI Exec
result event.

* Makes sure that the channel frame queue is empty on hangup.

Review: https://reviewboard.asterisk.org/r/1183/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@314069 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-18 16:10:10 +00:00
Richard Mudgett
651f51534c Revert flushing stale AsyncAGI commands from -r313615.
It looks like it was intentional to leave any commands or in-flight
commands in the queue in case Async AGI is run again on the call.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@313700 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-13 22:52:47 +00:00
Richard Mudgett
2b292d7869 Miscellaneous AGI diagnostic message cleanup and code optimization.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@313658 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-13 17:47:43 +00:00
Richard Mudgett
f6c540157f * Add missing channel lock to handle_cli_agi_add_cmd().
* Flush any Async AGI commands left over from earlier Async AGI control of
the call.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@313615 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-13 17:18:49 +00:00
Richard Mudgett
b183d64131 Merged revisions 313579 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r313579 | rmudgett | 2011-04-13 11:29:49 -0500 (Wed, 13 Apr 2011) | 48 lines
  
  Merged revisions 313545 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r313545 | rmudgett | 2011-04-13 11:21:24 -0500 (Wed, 13 Apr 2011) | 41 lines
    
    Asterisk does not hangup a channel after endpoint hangs up.
    
    If the call that the dialplan started an AGI script for is hungup while
    the AGI script is in the middle of a command then the AGI script is not
    notified of the hangup.  There are many AGI Exec commands that this can
    happen with.  The reported applications have been: Background, Wait, Read,
    and Dial.  Also the AGI Get Data command.
    
    * Don't wait on the Asterisk channel after it has hung up.  The channel is
    likely to never need servicing again.
    
    * Restored the AGI script's ability to return the AGI_RESULT_HANGUP value
    in run_agi().  It previously only could return AGI_RESULT_SUCCESS or
    AGI_RESULT_FAILURE after the DeadAGI and AGI applications were merged.
    
    (closes issue #17954)
    Reported by: mn3250
    Patches:
          issue17954_v1.8.patch uploaded by rmudgett (license 664)
          issue17954_v1.6.2.patch uploaded by rmudgett (license 664)
          issue17954_v1.4.patch uploaded by rmudgett (license 664)
    Tested by: rmudgett
    JIRA SWP-2171
    
    (closes issue #18492)
    Reported by: devmod
    Tested by: rmudgett
    JIRA SWP-2761
    
    (closes issue #18935)
    Reported by: nvitaly
    Tested by: astmiv, rmudgett
    JIRA SWP-3216
    
    (closes issue #17393)
    Reported by: siby
    Tested by: rmudgett
    JIRA SWP-2727
    
    Review: https://reviewboard.asterisk.org/r/1165/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@313588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-13 16:31:50 +00:00
Jonathan Rose
7cf95da39a Changes some print statements/events to use a blank string in place of NULL if the string in question is NULL.
This is supposed to improve Solaris compatibility since Solaris goes berserk when trying to output NULL strings.

(closes issue #18759)
Reported by: bklang
Patches:
      null-strings.patch uploaded by bklang (license 919)



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@311352 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-18 16:19:05 +00:00
Matthew Nicholson
87b246e421 Properly populate the LOCALSTATIONID channel variable.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@311342 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-18 16:02:50 +00:00
Terry Wilson
8fe14985fb Add \r\n to remaining http headers passed to ast_http_send
r309204 changed the behavior of ast_http_send. It now requires headers
to be passed with trailing \r\n. This change updates the remaining
instances in the code that did not pass the \r\n.

(closes issue #18186)
Reported by: nivaldomjunior
Patches: 
      res_phoneprov.c.diff uploaded by lathama (license 1028)
      manager.diff.txt uploaded by twilson (license 396)
Tested by: lathama


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@310240 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-10 16:05:45 +00:00
Tilghman Lesher
15641c348e Merged revisions 310141 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r310141 | tilghman | 2011-03-09 23:51:37 -0600 (Wed, 09 Mar 2011) | 12 lines
  
  Merged revisions 310140 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r310140 | tilghman | 2011-03-09 23:38:44 -0600 (Wed, 09 Mar 2011) | 5 lines
    
    Initialize column size to 0 to deal with a potential UnixODBC bug on 64-bit systems.
    
    (closes issue #18295)
     Reported by: pruiz
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@310142 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-10 05:53:29 +00:00
Terry Wilson
08b05120a9 Spelling fix in "calendar show calendar"
s/Cartegories/Catagories/

(closes issue #18931)
Reported by: pdugas
Patches: 
      res_calendar.c.patch uploaded by pdugas (license 1222)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@310039 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-08 18:10:50 +00:00
Tilghman Lesher
4a3cecd3ed Merged revisions 307792 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r307792 | tilghman | 2011-02-14 14:10:28 -0600 (Mon, 14 Feb 2011) | 8 lines
  
  Increment usage count at first reference, to avoid a race condition with many threads creating connections all at once.
  
  (issue #18156)
   Reported by: asgaroth
   Patches: 
         20110214__issue18156.diff.txt uploaded by tilghman (license 14)
   Tested by: tilghman
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@307793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-14 20:16:55 +00:00
Andrew Latham
bb2cd0fc1a Replacing doc/* with wiki links
Adding links to http(s)://wiki.asterisk.org



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@305798 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-02 18:56:42 +00:00
Jason Parker
97bbc8a227 Merged revisions 305472 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r305472 | qwell | 2011-02-01 11:02:09 -0600 (Tue, 01 Feb 2011) | 16 lines
  
  Merged revisions 305471 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r305471 | qwell | 2011-02-01 11:00:55 -0600 (Tue, 01 Feb 2011) | 9 lines
    
    Close file descriptor for timing source when a MOH class gets destroyed.
    
    (closes issue #18457)
    Reported by: mcallist
    Patches: 
          18457-closetimer.diff uploaded by qwell (license 4)
          18457-closetimer_trunk.diff uploaded by qwell (license 4)
    Tested by: qwell, loloski
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@305473 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-01 17:04:23 +00:00
Jason Parker
9f1bd1cc31 Fix compile error. pseudofd no longer exists.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@305198 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-31 21:30:44 +00:00
Jason Parker
19df01b8bc Merged revisions 305130 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r305130 | qwell | 2011-01-31 14:59:37 -0600 (Mon, 31 Jan 2011) | 9 lines
  
  Merged revisions 305129 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r305129 | qwell | 2011-01-31 14:56:25 -0600 (Mon, 31 Jan 2011) | 2 lines
    
    Set file descriptors to -1 on creation, so that we don't see weirdness later.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@305131 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-31 21:00:25 +00:00
Andrew Latham
b7d7fc94c2 Add Function and Application Relationships to documentation
Add and extend the see-also sections to the documentation for applications
and functions in an effort to expand the online documentation of the wiki.
Also check for and update any links to moved documentation in the doc folder.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@304908 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-30 00:11:56 +00:00
Sean Bright
29a1b6f336 Merged revisions 304865 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r304865 | seanbright | 2011-01-29 18:05:25 -0500 (Sat, 29 Jan 2011) | 7 lines
  
  Plug some memory leaks in the LDAP realtime driver.
  
  (closes issue #18435)
  Reported by: zaltar
  Patches:
        res_config_ldap.patch uploaded by zaltar (license 1148)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@304866 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-29 23:07:18 +00:00
Matthew Nicholson
193a80b513 Reimplemented fax session reservation to reverse the ABI breakage introduced in r297486.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@303907 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-25 20:56:12 +00:00
Jason Parker
dcd9b4347f Fix typo pointed out on asterisk-users list.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@302600 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-19 20:14:40 +00:00
Sean Bright
5001656eb4 Merged revisions 302548 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r302548 | seanbright | 2011-01-19 13:37:09 -0500 (Wed, 19 Jan 2011) | 10 lines
  
  Properly handle partial reads from fgets() when handling AGIs.
  
  When fgets() failed with EAGAIN, we were continually decrementing the available
  space left in our buffer, resulting in botched command handling.
  
  (closes issue #16032)
  Reported by: notahat
  Patches:
        agi_buffer_patch2.diff uploaded by fnordian (license 110)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@302549 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-19 18:43:11 +00:00
Paul Belanger
aa7a044fe6 Merged revisions 302461 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r302461 | pabelanger | 2011-01-19 12:08:01 -0500 (Wed, 19 Jan 2011) | 2 lines
  
  Handle 'Resource temporarily unavailable' error more gracefully.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@302462 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-19 17:09:35 +00:00
Tilghman Lesher
4595678cf9 Merged revisions 300622 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r300622 | tilghman | 2011-01-05 12:54:58 -0600 (Wed, 05 Jan 2011) | 17 lines
  
  Merged revisions 300621 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r300621 | tilghman | 2011-01-05 12:47:46 -0600 (Wed, 05 Jan 2011) | 10 lines
    
    Use the sanity check in place of the disconnect/connect cycle.
    
    The disconnect/connect cycle has the potential to cause random crashes.
    
    (closes issue #18243)
     Reported by: ks3
     Patches: 
           res_odbc.patch uploaded by ks3 (license 1147)
     Tested by: ks3
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@300623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-05 18:56:12 +00:00
Jan Kalab
ff9a7fa13e Memory leaking in calendars
ne_request_destroy() was missing in icalendar and exchange calendar modules, causing memory leak.

(closes issue #18521)
Review: https://reviewboard.asterisk.org/r/1068/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@300214 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-04 17:01:52 +00:00
Tilghman Lesher
6963e5d1c4 Merged revisions 299448 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r299448 | tilghman | 2010-12-22 14:03:30 -0600 (Wed, 22 Dec 2010) | 8 lines
  
  Resolve warnings by disambiguating the "s" extension as used by chan_dahdi from the "s" extension as used by the AEL macros.
  
  (closes issue #18480)
   Reported by: nivek
   Patches: 
         20101215__issue18480__2.diff.txt uploaded by tilghman (license 14)
   Tested by: nivek
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@299449 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-22 20:05:02 +00:00
Tilghman Lesher
4a3350bd9d Merged revisions 298481 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r298481 | tilghman | 2010-12-16 03:04:38 -0600 (Thu, 16 Dec 2010) | 21 lines
  
  Merged revisions 298480 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r298480 | tilghman | 2010-12-16 03:03:40 -0600 (Thu, 16 Dec 2010) | 14 lines
    
    Only increment the pointer once per loop, otherwise we corrupt the value.
    
    (closes issue #18251)
     Reported by: bcnit
     Patches: 
           20101110__issue18251.diff.txt uploaded by tilghman (license 14)
     Tested by: trev, jthurman, elguero
    
    (closes issue #18279)
     Reported by: zerohalo
     Patches: 
           20101109__issue18279.diff.txt uploaded by tilghman (license 14)
     Tested by: zerohalo
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@298482 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-16 09:05:28 +00:00
Matthew Nicholson
041535f994 Prevent a memcpy overlap in GENERIC_FAX_EXEC_SET_VARS
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@298054 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-10 16:52:11 +00:00
Matthew Nicholson
5b8a1e8bc5 Display the capabilities requested when requesting a fax session fails instead of displaying a hex value.
Tweak the way fax stats are calculated so that all fax attempts and faliures are logged.  Also make ensure faxes are either counted as completed or falied and never both.

FAX-210


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@297905 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-08 16:12:26 +00:00
Matthew Nicholson
f847ff2c38 Print a DEBUG message instead of a WARNING message when the selected fax tech does not support reserving sessions.
Answer the channel before quering it for t.38 support.  This is necessary for the query to work properly over local channels.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@297495 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-03 15:21:52 +00:00
Matthew Nicholson
93454c0e30 Add support for reserving a fax session before answering the channel.
Note: this change breaks ABI compatibility.

FAX-217


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@297486 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-02 21:30:47 +00:00
Matthew Nicholson
26e5a0d111 Changed some NOTICE and WARNING messages to DEBUG messages.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@297157 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-01 19:47:33 +00:00
Brad Watkins
81bb08714f Fix XMPP PubSub-based distributed device state.
Initialize pubsubflags to 0 so res_jabber doesn't think there is already an XMPP connection sending device state.  Also clean up CLI commands a bit.

(closes issue #18272)
Reported by: klaus3000
Patches:
      res_jabber_fix_pubsubflags_and_CLI-patch.txt uploaded by klaus3000 (license 65)
Tested by: klaus3000, Marquis

Review: https://reviewboard.asterisk.org/r/1030/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@296354 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-26 18:31:17 +00:00
Paul Belanger
f284b66dda Merged revisions 295440 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r295440 | pabelanger | 2010-11-18 12:51:34 -0500 (Thu, 18 Nov 2010) | 4 lines
  
  Fix compiler warnings when using openssl-dev 1.0.0+
  
  Review: https://reviewboard.asterisk.org/r/1016/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@295441 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-18 18:02:12 +00:00
Russell Bryant
a4715fdf2d Tweak a couple of CLI commands back to their original form.
The "module" in this case is two parts, so there are two words before
the verb of the CLI command.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@294535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-10 14:14:51 +00:00
Jeff Peeler
b12f27f231 Merged revisions 294312 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r294312 | jpeeler | 2010-11-08 16:30:49 -0600 (Mon, 08 Nov 2010) | 1 line
  
  add missing unlock not present in 294277
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@294313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-08 22:32:13 +00:00
Jeff Peeler
375b5b6b09 Merged revisions 294277 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r294277 | jpeeler | 2010-11-08 15:58:13 -0600 (Mon, 08 Nov 2010) | 16 lines
  
  Fix playback failure when using IAX with the timerfd module.
  
  To fix this issue the alert pipe will now be used when the timerfd module is
  in use. There appeared to be a race that was not solved by adding locking in the
  timerfd module, but needed to be there anyway. The race was between the timer
  being put in non-continuous mode in ast_read on the channel thread and the IAX 
  frame scheduler queuing a frame which would enable continuous mode before the
  non-continuous mode event was read. This race for now is simply avoided.
  
  (closes issue #18110)
  Reported by: tpanton
  Tested by: tpanton
  
  I put tested by tpanton because it was tested on his hardware. Thanks for the
  remote access to debug this issue!
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@294278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-08 21:59:45 +00:00
Terry Wilson
3bb6f58420 Set a default waittime, and make sure to convert it to milliseconds
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@294207 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-08 19:56:10 +00:00
Tilghman Lesher
e90dbe2963 Merged revisions 293195-293196 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r293195 | tilghman | 2010-10-28 14:52:52 -0500 (Thu, 28 Oct 2010) | 12 lines
  
  Merged revisions 293194 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r293194 | tilghman | 2010-10-28 14:44:37 -0500 (Thu, 28 Oct 2010) | 5 lines
    
    "!00" evaluated as false, which is incorrect.  Fixing.
    
    Reported (though the reporter did not understand he was reporting a bug) on the asterisk-users list:
    http://lists.digium.com/pipermail/asterisk-users/2010-October/255505.html
  ........
................
  r293196 | tilghman | 2010-10-28 14:54:34 -0500 (Thu, 28 Oct 2010) | 12 lines
  
  Merged revisions 293194 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r293194 | tilghman | 2010-10-28 14:44:37 -0500 (Thu, 28 Oct 2010) | 5 lines
    
    "!00" evaluated as false, which is incorrect.  Fixing.
    
    Reported (though the reporter did not understand he was reporting a bug) on the asterisk-users list:
    http://lists.digium.com/pipermail/asterisk-users/2010-October/255505.html
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@293197 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-28 20:00:06 +00:00
Russell Bryant
d39850c2e9 Add var=value to log message on update failure, and add newline.
... just for you, Leif.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@292523 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-21 11:36:47 +00:00
Tilghman Lesher
6ff3d6b761 Oops. This module uses the generic timer and no longer uses DAHDI.
This causes a problem with the Solaris and other system builds that have gcc
4.1 (where optional_api is non-optional).


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@292376 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-20 00:40:29 +00:00
Terry Wilson
668d532d6b Add sip show peer info about crypto and remove dated comment
This patch adds information about the encryption setting to 'sip show
peers' and removes an out-of-date comment from res_srtp.c and instead
directs users to the proper documentation.

(closes issue #18140)
Reported by: chodorenko



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@292309 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-19 19:27:32 +00:00
Tzafrir Cohen
12211219dc Merged revisions 292049 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r292049 | tzafrir | 2010-10-16 12:03:04 +0200 (ש', 16 אוק 2010) | 15 lines
  
  Base directory for MOH should be ASTDATADIR
  
  If the directive 'directory' is relative, make it relative to the
  datadir, rather than to the varlibdir. In the sample configuration
  it is relative ('moh').
  
  This has no effect unless you have actively set the datadir explicitly
  (at build time or at run time).
  
  (closes issue #16906)
  Patches:
        moh_datadir uploaded by tzafrir (license 46)
  
  Review: https://reviewboard.asterisk.org/r/974/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@292050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-16 10:47:00 +00:00
Terry Wilson
5b5faf3fc5 Ref/unref res_srtp when we create/destroy a session
This avoids unhappy crashing when we try to 'core stop gracefully' and res_srtp
tries to unload before chan_sip does. Thanks, Russell!

(closes issue #18085)
Reported by: st


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@292016 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-15 21:40:56 +00:00
Terry Wilson
36a672b7e8 Merged revisions 291904 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r291904 | twilson | 2010-10-15 09:16:57 -0700 (Fri, 15 Oct 2010) | 7 lines
  
  Don't crash or deadlock on module unload
  
  We can't hold the lock while pthread_join is called since aji_log_hook will
  attempt to lock from the other therad. We reorder the pthread_join and
  ast_aji_disconnect so that we don't do an SSL_read() while SSL_shutdown is
  running, causing a crash.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@291905 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-15 16:39:58 +00:00
David Vossel
f5782280d8 Gtalk enhancements and general code cleanup.
This patch includes several chan_gtalk enhancements.
Two new gtalk.conf options have been added, externip
and stunadd.  Setting externip allows us to
manually specify what the external IP address is
outside of a NAT environment.  Setting the stunaddr
option to a valid stun server allows for that external
ip to be retrieved via a STUN server automatically.  This
external IP is then advertised during call setup as
a possible candidate.

I have also attempted to clean up chan_gtalk's code
so it meets our coding guidelines. During this cleanup
I noticed several things that need to be done in the
code and made a TODO section at the top of the file.




git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@291192 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-11 21:38:39 +00:00
Terry Wilson
13562fd2e3 Don't try to send RTP when remote_address is null
It is possible for ast_rtp_stop() to be called which will clear the remote
address and cause the sendto to fail and spam warnings. Don't send in this
case.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@290542 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-06 04:35:51 +00:00