← Back to branch summary

~ubuntu-branches/ubuntu/lucid/asterisk/lucid-proposed

« back to all changes in this revision

Viewing changes to pbx/pbx_spool.c

  • Committer: Bazaar Package Importer
  • Author(s): Dave Walker (Daviey)
  • Date: 2009-09-22 16:22:14 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20090922162214-awce8id0lt9v51jb
Tags: 1:1.6.2.0~rc2-0ubuntu1

* New upstream version, upstream is now DFSG compliant.
  - ilibc has been removed upstream.
  - Music on Hold is now cc-by-sa.
  - binary firmware iaxy.bin has been removed upstream.
* debian/rules: Santitised UPSTREAM variable for compatiability
  with Ubuntu and other variants.
* debian/control: Removed Debian Vcs-Svn entry and replaced 
  with ubuntu-voip Vcs-Bzr, to reflect divergence in packages.
* patches/makefile_appdocs_dtd: Removed, merged upstream.
* patches/disable_moh: Previosly disabled, removed from pool.
* patches/ubuntu-banner: Ported debian-banner to display Ubuntu
  centric bug report information.
* Refresh quilt patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
pbx/pbx_spool.c
24
24
 
25
25
#include "asterisk.h"
26
26
 
27
 
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 179745 $")
 
27
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 211580 $")
28
28
 
29
29
#include <sys/stat.h>
30
30
#include <time.h>
172
172
                                } else if (!strcasecmp(buf, "data")) {
173
173
                                        ast_string_field_set(o, data, c);
174
174
                                } else if (!strcasecmp(buf, "maxretries")) {
175
 
                                        if (sscanf(c, "%d", &o->maxretries) != 1) {
 
175
                                        if (sscanf(c, "%30d", &o->maxretries) != 1) {
176
176
                                                ast_log(LOG_WARNING, "Invalid max retries at line %d of %s\n", lineno, fn);
177
177
                                                o->maxretries = 0;
178
178
                                        }
183
183
                                } else if (!strcasecmp(buf, "extension")) {
184
184
                                        ast_string_field_set(o, exten, c);
185
185
                                } else if (!strcasecmp(buf, "priority")) {
186
 
                                        if ((sscanf(c, "%d", &o->priority) != 1) || (o->priority < 1)) {
 
186
                                        if ((sscanf(c, "%30d", &o->priority) != 1) || (o->priority < 1)) {
187
187
                                                ast_log(LOG_WARNING, "Invalid priority at line %d of %s\n", lineno, fn);
188
188
                                                o->priority = 1;
189
189
                                        }
190
190
                                } else if (!strcasecmp(buf, "retrytime")) {
191
 
                                        if ((sscanf(c, "%d", &o->retrytime) != 1) || (o->retrytime < 1)) {
 
191
                                        if ((sscanf(c, "%30d", &o->retrytime) != 1) || (o->retrytime < 1)) {
192
192
                                                ast_log(LOG_WARNING, "Invalid retrytime at line %d of %s\n", lineno, fn);
193
193
                                                o->retrytime = 300;
194
194
                                        }
195
195
                                } else if (!strcasecmp(buf, "waittime")) {
196
 
                                        if ((sscanf(c, "%d", &o->waittime) != 1) || (o->waittime < 1)) {
 
196
                                        if ((sscanf(c, "%30d", &o->waittime) != 1) || (o->waittime < 1)) {
197
197
                                                ast_log(LOG_WARNING, "Invalid waittime at line %d of %s\n", lineno, fn);
198
198
                                                o->waittime = 45;
199
199
                                        }
200
200
                                } else if (!strcasecmp(buf, "retry")) {
201
201
                                        o->retries++;
202
202
                                } else if (!strcasecmp(buf, "startretry")) {
203
 
                                        if (sscanf(c, "%ld", &o->callingpid) != 1) {
 
203
                                        if (sscanf(c, "%30ld", &o->callingpid) != 1) {
204
204
                                                ast_log(LOG_WARNING, "Unable to retrieve calling PID!\n");
205
205
                                                o->callingpid = 0;
206
206
                                        }