Commit Graph

16409 Commits

Author SHA1 Message Date
Mark Michelson 261d1eeb13 The -1 return value from incomplete or improper
headers for the SipNotify manager command was
causing the current manager session to become
disconnected. Change the return value to 0 for
these cases.

Also change a test for a NULL pointer to be
ast_strlen_zero instead.

(closes issue #13351)
Reported by: Laureano
Patches:
      sipnotify_action_fix.patch uploaded by Laureano (license 265)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139563 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 20:20:58 +00:00
Mark Michelson 060f6d5c3d Add missing unique id to ParkedCallGiveUp and ParkedCallTimeOut
manager events

(closes issue #13358)
Reported by: srt
Patches:
      13358_parking_events.diff uploaded by srt (license 378)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139558 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 20:02:35 +00:00
Mark Michelson c0754e89ad Merged revisions 139553 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139553 | mmichelson | 2008-08-22 14:45:19 -0500 (Fri, 22 Aug 2008) | 8 lines

Fix compilation when DEBUG_THREAD_LOCALS is selected

(closes issue #13298)
Reported by: snuffy
Patches:
      bug13298_20080822.diff uploaded by snuffy (license 35)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139554 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 19:45:41 +00:00
Mark Michelson 93fa8f7649 Blocked revisions 139521 via svnmerge
........
r139521 | mmichelson | 2008-08-22 14:23:02 -0500 (Fri, 22 Aug 2008) | 8 lines

Remove show_frame_stats_deprecated since it is not
used anywhere and causes build errors if building under
dev-mode with TRACE_FRAMES selected in menuselect.

(closes issue #13362)
Reported by: snuffy


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139525 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 19:24:26 +00:00
Mark Michelson e13a77e628 Merged revisions 139466 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139466 | mmichelson | 2008-08-22 12:24:47 -0500 (Fri, 22 Aug 2008) | 3 lines

Fix the build. Thanks, mvanbaak!


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 17:25:12 +00:00
Mark Michelson 8b5c762f83 Merged revisions 139456 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139456 | mmichelson | 2008-08-22 11:57:38 -0500 (Fri, 22 Aug 2008) | 7 lines

Prevent a deadlock in chan_iax2 resulting from
incorrect locking order between iax2_pvt and
ast_channel structures.

AST-13


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139457 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 16:58:21 +00:00
Jeff Peeler a9af5a81c9 Merged revisions 139387 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139387 | jpeeler | 2008-08-21 18:39:31 -0500 (Thu, 21 Aug 2008) | 3 lines

Fixes loop that could possibly never exit in the event of a channel never being able to be opened or specify after a restart.
(closes issue #11017)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139391 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-21 23:41:50 +00:00
Dwayne M. Hubbard a33f98a576 oops
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139346 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-21 23:00:31 +00:00
Dwayne M. Hubbard b639acbde9 initiate T38 negotiation in FaxSend; use channel variables; other stuff too
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139345 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-21 22:54:18 +00:00
Philippe Sultan 6571a25767 Fix two memory leaks in chan_gtalk, thanks Eliel!
(closes issue #13310)
Reported by: eliel
Patches:
      chan_gtalk.c.patch uploaded by eliel (license 64)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139281 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-21 09:55:31 +00:00
Russell Bryant 89eaa39a6a Merged revisions 139213 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139213 | russell | 2008-08-20 17:14:35 -0500 (Wed, 20 Aug 2008) | 11 lines

Fix a crash in the ChanSpy application.  The issue here is that if you call
ChanSpy and specify a spy group, and sit in the application long enough looping
through the channel list, you will eventually run out of stack space and the
application with exit with a seg fault.  The backtrace was always inside of
a harmless snprintf() call, so it was tricky to track down.  However, it turned
out that the call to snprintf() was just the biggest stack consumer in this
code path, so it would always be the first one to hit the boundary.

(closes issue #13338)
Reported by: ruddy

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139215 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 22:16:36 +00:00
Jason Parker d22fe17322 Fix output of sipshowpeer manager response.
(closes issue #13346)
Reported by: srt
Patches:
      13346_malformed_sip_show_peer_response.diff uploaded by srt (license 378)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139210 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 22:06:40 +00:00
Shaun Ruffell b39e0f3c66 Remove extraneous debugging messages.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139154 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 20:03:28 +00:00
Shaun Ruffell f75d794c69 Fix bug where the samples were not accurate when in G723 mode, which would
cause the timestamp field of the RTP header to be invalid.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139153 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 19:57:22 +00:00
Kevin P. Fleming 3e1f872538 Blocked revisions 139145 via svnmerge
........
r139145 | kpfleming | 2008-08-20 14:35:59 -0500 (Wed, 20 Aug 2008) | 8 lines

Backport support for Zaptel/DAHDI channel-level alarms from trunk/1.6, because not doing so just makes it difficult for people with channels that are in alarm when Asterisk starts up to get them going once the alarm is cleared

(closes issue #12160)
Reported by: tzafrir
Patches:
      asterisk-chanalarms_14.patch uploaded by tzafrir (license 46)
Tested by: tzafrir

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139146 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 19:36:27 +00:00
Steve Murphy 1b2e0a4365 Merged revisions 139074 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139074 | murf | 2008-08-20 11:14:55 -0600 (Wed, 20 Aug 2008) | 12 lines


(closes issue #13263)
Reported by: brainy
Tested by: murf

The specialized reset routine is tromping on the
flags field of the CDR. I made a change to not
reset the DISABLED bit. This should get rid of this
problem.



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139083 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 17:25:07 +00:00
Michiel van Baak 877549af70 fix unholding phones after hangup on older cisco phones.
Patch by wedhorn.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139020 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 16:16:53 +00:00
Mark Michelson c4b34ef45d Merged revisions 139015 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139015 | mmichelson | 2008-08-20 10:37:56 -0500 (Wed, 20 Aug 2008) | 6 lines

sip_read should properly handle a NULL return from sip_rtp_read.

(closes issue #13257)
Reported by: travishein


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139016 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 15:38:47 +00:00
Jeff Peeler 78c68e8015 Blocked revisions 138949 via svnmerge
........
r138949 | jpeeler | 2008-08-19 18:22:39 -0500 (Tue, 19 Aug 2008) | 1 line

add DAHDI_POLICY_WHEN_FULL compatability define for Zaptel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138951 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 23:23:02 +00:00
Mark Michelson b11ecaf4d6 Merged revisions 138942 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138942 | mmichelson | 2008-08-19 18:17:17 -0500 (Tue, 19 Aug 2008) | 11 lines

Reset agent_pvt variables back to the values in agents.conf
(from what the corresponding channel variables were set to)
when the agent logs out.

(closes issue #13098)
Reported by: davidw
Patches:
      20080731__issue13098_agent_ackcall_not_reset.diff uploaded by bbryant (license 36)
Tested by: davidw


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138943 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 23:19:40 +00:00
Jeff Peeler fb5a025b71 Blocked revisions 138938 via svnmerge
........
r138938 | jpeeler | 2008-08-19 17:56:07 -0500 (Tue, 19 Aug 2008) | 7 lines

Add configuration option to chan_dahdi.conf to allow buffering policy and number of buffers to be configured per channel. Syntax:

buffers=<num of buffers>,<policy>

Where the number of buffers is some non-negative integer and the policy is either "full", "half", or "immediate".


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 22:56:42 +00:00
Mark Michelson b949d5347e Merged revisions 138886 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138886 | mmichelson | 2008-08-19 13:50:53 -0500 (Tue, 19 Aug 2008) | 23 lines

Add a lock and unlock prior to the destruction of the chanspy_ds
lock to ensure that no other threads still have it locked. While
this should not happen under normal circumstances, it appears that
if the spyer and spyee hang up at nearly the same time, the following
may occur.

1. ast_channel_free is called on the spyee's channel.
2. The chanspy datastore is removed from the spyee's channel in 
   ast_channel_free.
3. In the spyer's thread, the spyer attempts to remove and destroy the datastore
   from the spyee channel, but the datastore has already been removed in step 2, 
   so the spyer continues in the code.
4. The spyee's thread continues and calls the datastore's destroy callback, 
   chanspy_ds_destroy. This involves locking the chanspy_ds.
5. Now the spyer attempts to destroy the chanspy_ds lock. The problem is that in step 4, 
   the spyee has locked this lock, meaning that the spyer is attempting to destroy a lock 
   which is currently locked by another thread.

The backtrace provided in issue #12969 supports the idea that this is possible
(and has even occurred). This commit does not close the issue, but should help
in preventing one type of crash associated with the use of app_chanspy.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138887 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 18:52:04 +00:00
Michiel van Baak 3f3b1d4dad chan_skinny now respects callwaiting=no
(closes issue #12691)
Reported by: sbisker
Patches:
      callwaitingv1.diff uploaded by wedhorn (license 30)
Tested by: wedhorn on old skinny phones, mvanbaak on 7960 and 7905 with latest firmware


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138851 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 16:56:50 +00:00
Steve Murphy d78f79d82c Oops. put a decl in a generated file. My bad, but fixed now.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138845 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 16:31:24 +00:00
Steve Murphy 04795d963f These changes are in regards to bug 13249, where users are being surprised by the changes made
to the Set app in trunk/1.6.x, as they come from the 1.4 world. They are only bitten if
they write their AEL dialplan in the 1.4 world, and then carry it over to a trunk/1.6.x 
installation where a "make samples" was executed, or where they hand-edited the 
asterisk.conf file and added the [compat] category with app_set = 1.6 (or higher).

(this commit does not totally solve 13249, at least not yet)

The change involves issueing a single warning while the AEL file is loading, if:
 1. app_set is present in the config file, and set to 1.6 or higher.
 2. there are double quotes in an assignment statement (eg x = "hi there";)
 3. the warning was not already issued.

The standalone app, aelparse, does not (yet) issue this warning. I'd have to
have it read in the asterisk.conf file, and that's a bit of hassle. I'll add
it if users request it, tho.




git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138815 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 15:59:12 +00:00
Philippe Sultan 4d9a38bc3f Mention JID rather than SreenName in help messages
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138814 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 15:58:39 +00:00
Sean Bright d8fc34c771 Let it compile now, too (woops)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138780 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 00:10:56 +00:00
Sean Bright 0f396d9b8b And remove code we don't need anymore.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138779 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 00:09:38 +00:00
Sean Bright 0e9bb93b87 While we're at it, make this machine parseable too.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138778 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 00:08:27 +00:00
Sean Bright 711cc76722 Change event header to RegistrationTime to be more consistent (and avoid
breaking existing frameworks).  Pointed out by Laureano on #asterisk-dev.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138775 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 23:42:36 +00:00
Richard Mudgett 1678a005b6 channels/chan_misdn.c
*  Made bearer2str() use allowed_bearers_array[]
*  Made use the causes.h defines instead of hardcoded numbers.
*  Made use Asterisk presentation indicator values if either of the
mISDN presentation or screen options are negative.
*  Updated the misdn_set_opt application option descriptions.
*  Renamed the awkward Caller ID presentation misdn_set_opt
application option value not_screened to restricted.
Deprecated the not_screened option value.

channels/misdn/isdn_lib.c
*  Made use the causes.h defines instead of hardcoded numbers.
*  Fixed some spelling errors and typos.
*  Added all defined facility code strings to fac2str().

channels/misdn/isdn_lib.h
*  Added doxygen comments to struct misdn_bchannel.

channels/misdn/isdn_lib_intern.h
*  Added doxygen comments to struct misdn_stack.

channels/misdn_config.c
configs/misdn.conf.sample
*  Updated the mISDN presentation and screen parameter descriptions.

doc/tex/misdn.tex
*  Updated the misdn_set_opt application option descriptions.
*  Fixed some spelling errors and typos.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138738 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 21:07:28 +00:00
Mark Michelson 612f8c85b4 Change the queue timeout priority logic into less ugly
and confusing code pieces. Clarify the logic within
queues.conf.sample.

(closes issue #12690)
Reported by: atis
Patches:
      queue_timeoutpriority.patch uploaded by atis (license 242)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138694 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 20:23:11 +00:00
Mark Michelson 16a0e23110 Merged revisions 138685 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138685 | mmichelson | 2008-08-18 15:01:14 -0500 (Mon, 18 Aug 2008) | 10 lines

Change the inequalities used in app_queue with regards
to timeouts from being strict to non-strict for more
accuracy.

(closes issue #13239)
Reported by: atis
Patches:
      app_queue_timeouts_v2.patch uploaded by atis (license 242)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138687 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 20:04:10 +00:00
Jason Parker 36a1024741 Remove option that isn't valid here.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138631 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 15:54:07 +00:00
Sean Bright d68582b707 Blocked revisions 138569 via svnmerge
........
r138569 | seanbright | 2008-08-18 07:57:24 -0400 (Mon, 18 Aug 2008) | 1 line

You know what's awesome?  Code that compiles... ;)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138570 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 11:58:49 +00:00
Jeff Peeler f10e6dec36 add missing define for SS7 in dahdi_restart
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138518 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 02:13:04 +00:00
Jeff Peeler ea7b29dead Blocked revisions 138516 via svnmerge
........
r138516 | jpeeler | 2008-08-17 21:05:29 -0500 (Sun, 17 Aug 2008) | 1 line

fix compilation warnings
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 02:06:54 +00:00
Sean Bright 642dd656eb Move Uniqueid to the end of the event for those that rely on the position
of the name/value pairs, pointed out by snuffy-home on #asterisk-commits.

For those of you who rely on the position of name/value pairs in manager
events... stop... that is why associative arrays were invented.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138482 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-17 14:12:11 +00:00
Sean Bright c8c264b9ad Add Uniqueid header to ParkedCall manager event.
(closes issue #13323)
Reported by: srt
Patches:
      13323_unique_id_for_parkedcalls_event.diff uploaded by srt (license 378)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138479 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-17 13:51:08 +00:00
Sean Bright 9ff1434641 Add missing colons to RTCPReceived and RTCPSent manager events.
(closes issue #13319)
Reported by: srt
Patches:
      13319_rtcp_manager_event_headers.diff uploaded by srt (license 378)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138476 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-17 13:40:36 +00:00
Sean Bright 69c6dcba67 Fix the output of the JitterBufStats manager event.
(closes issue #13324)
Reported by: srt
Patches:
      13324_missing_nl_in_jitterbufstats_event_2.diff uploaded by srt (license 378)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138473 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-17 13:31:54 +00:00
Sean Bright baaaaf4b6b Since it's introduction in revision 3497, cdr_tds has *never* read
the port configuration option from cdr_tds.conf.  So go ahead and
remove it from the sample config.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138442 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 16:40:43 +00:00
Tilghman Lesher 6d7ee132e3 Fix compilation warnings (found with dev-mode)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138412 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 13:07:08 +00:00
Tilghman Lesher f4586f3018 Also make sure hinting won't crash on reload.
(Closes issue #13312)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138409 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 12:52:06 +00:00
Jeff Peeler a4db659925 Merged revisions 138360 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138360 | jpeeler | 2008-08-15 20:12:18 -0500 (Fri, 15 Aug 2008) | 1 line

fixes use count to properly decrement if an active dahdi channel is destroyed allowing module to be unloaded
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138361 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 01:13:26 +00:00
Jeff Peeler 729cb1d390 Merged revisions 138119,138151,138238 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138119 | jpeeler | 2008-08-15 14:21:51 -0500 (Fri, 15 Aug 2008) | 4 lines

Fixes the dahdi restart functionality. Dahdi restart allows one to restart all DAHDI channels, even if they are currently in use. This is different from unloading and then loading the module since unloading requires the use count to be zero. Reloading the module is different in that the signalling is not changed from what it was originally configured. Also, this fixes not closing all the file descriptors for D-channels upon module unload (which would prevent loading the module afterwards).

(closes issue #11017)

........
r138151 | jpeeler | 2008-08-15 14:41:29 -0500 (Fri, 15 Aug 2008) | 1 line

declared static mutexes using AST_MUTEX_DEFINE_STATIC macro
........
r138238 | jpeeler | 2008-08-15 16:28:26 -0500 (Fri, 15 Aug 2008) | 1 line

initialize condition variable ss_thread_complete using ast_cond_init
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138311 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 23:46:09 +00:00
Jeff Peeler 2f4f526ad6 Blocked revisions 138309 via svnmerge
........
r138309 | jpeeler | 2008-08-15 18:41:54 -0500 (Fri, 15 Aug 2008) | 1 line

add forgotten locks around ss_thread_count in ss_thread for dahdi restart
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138310 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 23:42:28 +00:00
Tilghman Lesher 8b6dd2ad43 Merged revisions 138258 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138258 | tilghman | 2008-08-15 17:33:42 -0500 (Fri, 15 Aug 2008) | 8 lines

More fixes for realtime peers.
(closes issue #12921)
 Reported by: Nuitari
 Patches: 
       20080804__bug12921.diff.txt uploaded by Corydon76 (license 14)
       20080815__bug12921.diff.txt uploaded by Corydon76 (license 14)
 Tested by: Corydon76

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138260 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 22:54:57 +00:00
Tilghman Lesher 3a5eb27579 Remove deprecated syntax from sample config file
(closes issue #13314)
 Reported by: kue


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138206 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 20:35:24 +00:00
Jeff Peeler 7fb2ed4c53 rename all zfd instances in chan_dahdi to dfd to match 1.4 (left over from DAHDI transition)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138155 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 20:12:19 +00:00