~ubuntu-branches/ubuntu/karmic/asterisk/karmic

« back to all changes in this revision

Viewing changes to res/res_adsi.c

  • Committer: Bazaar Package Importer
  • Author(s): Faidon Liambotis, Tzafrir Cohen, Faidon Liambotis
  • Date: 2007-12-06 17:20:21 UTC
  • mfrom: (1.1.19 upstream)
  • Revision ID: james.westby@ubuntu.com-20071206172021-pd0wrjirz3os7hia
Tags: 1:1.4.15~dfsg-1
* New upstream release (Closes: #452054)
  - Fix a potential corrupt of voicemail.conf on simultaneous PIN updates
    (Closes: #353227)

[ Tzafrir Cohen ]
* Add some sample/reference config files as documentation.
* Provide asterisk-bristuff for upgrading from Etch.
* Move libc-client to not be last, so debian/backports/xorcom.etch would
  still work.

[ Faidon Liambotis ]
* Really enable the libcap/ToS functionality; the previous patch didn't
  enable the functionality, even though the code and the libcap.so
  dependency were there. (Closes: #454342)
* Fix a minor issue with init script's stop target when running with
  safe_asterisk.
* Add chan_vpb, adding support for VoiceTronix OpenSwitch and OpenLine
  cards. (Closes: #396499)
* Fix debian/watch by using a pkg-voip wrapper to avoid upstream's silly
  redirections. (Closes: #449706)
* Use DEBVERSION as asterisk's version string.
* Disable the MD5 build sum that breaks all out-of-tree plugins (duh!).
* Create /usr/local/share/asterisk/sounds to put all site-specific
  non-modifiable sounds.
* Add a note about bugs.debian.org to the banner.
* Add noload for res_config_* since loading them results in errors and
  doesn't provide any functionality.
* News entries were added but we never shipped the file; ship NEWS.Debian.
* Add an entry to NEWS.Debian warning users about app_voicemail_*.so
  (Closes: #452596)
* Provide options in /etc/default/asterisk for configuring safe_asterisk.
  (Closes: #381786)

[ Tzafrir Cohen ]
* Provide a custom sounds directory under /var/lib - user-modifieble at
  runtime and hence not under /usr. (Closes: #337209)

Show diffs side-by-side

added added

removed removed

Lines of Context:
32
32
 
33
33
#include "asterisk.h"
34
34
 
35
 
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 53780 $")
 
35
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 89545 $")
36
36
 
37
37
#include <time.h>
38
38
#include <string.h>
168
168
                        /* Read a voice frame */
169
169
                        if (inf->subclass != AST_FORMAT_ULAW) {
170
170
                                ast_log(LOG_WARNING, "Channel not in ulaw?\n");
 
171
                                ast_frfree(inf);
171
172
                                return -1;
172
173
                        }
173
174
                        /* Send no more than they sent us */
182
183
                        outf.samples = amt;
183
184
                        if (ast_write(chan, &outf)) {
184
185
                                ast_log(LOG_WARNING, "Failed to carefully write frame\n");
 
186
                                ast_frfree(inf);
185
187
                                return -1;
186
188
                        }
187
189
                        /* Update pointers and lengths */
256
258
                                                if (!chan->adsicpe)
257
259
                                                        chan->adsicpe = AST_ADSI_UNAVAILABLE;
258
260
                                                errno = ENOSYS;
 
261
                                                ast_frfree(f);
259
262
                                                return -1;
260
263
                                        }
261
264
                                }