← Back to branch summary

~damg/ubuntu/quantal/asterisk/LP1097687

« back to all changes in this revision

Viewing changes to apps/app_sms.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:
apps/app_sms.c
36
36
 
37
37
#include "asterisk.h"
38
38
 
39
 
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 161571 $")
 
39
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 211580 $")
40
40
 
41
41
#include <dirent.h>
42
42
#include <ctype.h>
878
878
                                        } else if (!strcmp(line, "scts")) {    /* get date/time */
879
879
                                                int Y, m, d, H, M, S;
880
880
                                                /* XXX Why aren't we using ast_strptime here? */
881
 
                                                if (sscanf(p, "%d-%d-%dT%d:%d:%d", &Y, &m, &d, &H, &M, &S) == 6) {
 
881
                                                if (sscanf(p, "%4d-%2d-%2dT%2d:%2d:%2d", &Y, &m, &d, &H, &M, &S) == 6) {
882
882
                                                        struct ast_tm t = { 0, };
883
883
                                                        t.tm_year = Y - 1900;
884
884
                                                        t.tm_mon = m - 1;
1779
1779
                        h->iphasep = 0;
1780
1780
                }
1781
1781
                if (bit && h->ibitc == 200) {       /* sync, restart message */
1782
 
                        /* Protocol 2: empty connnection ready (I am master) */
 
1782
                        /* Protocol 2: empty connection ready (I am master) */
1783
1783
                        if (h->framenumber < 0 && h->ibytec >= 160 && !memcmp(h->imsg, "UUUUUUUUUUUUUUUUUUUU", 20)) {
1784
1784
                                h->framenumber = 1;
1785
1785
                                ast_verb(3, "SMS protocol 2 detected\n");