← Back to branch summary

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

« back to all changes in this revision

Viewing changes to res/res_smdi.c

  • Committer: Bazaar Package Importer
  • Author(s): Jean-Michel Dault, Faidon Liambotis, Tzafrir Cohen
  • Date: 2009-08-20 03:40:08 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090820034008-rg2s51o9ruqvmwml
Tags: 1:1.6.2.0~dfsg~beta4-0ubuntu1
http://bugs.debian.org/532971
http://bugs.debian.org/539150
* Merge from Debian.
  - Lsb patches dropped: fixed upstream
  - Patch for LP #350732 dropped: fixed upstream
* Added:
  - Add support for web interface
  - Don't enable voicetronix cards by default
  - Chown /dev/dahdi in init script
  - Add files for potential backports
  - Change maintainer
  - Standards version 3.8.3

* Debian changes

 [ Faidon Liambotis ]
 * Fix FTBFS on armel. (Closes: #532971)

 [ Tzafrir Cohen ]
 * New upstream beta.
 * Patch hardware_dtmf_mute_fix removed: Applied upstream.
 * No need for a separate app_directory_odbc (will use app_voicemail_odbc).
 * Fix name of voicemail 'openssl' dep. (Thomas Renard) (Closes: #539150)

Show diffs side-by-side

added added

removed removed

Lines of Context:
res/res_smdi.c
33
33
 
34
34
#include "asterisk.h"
35
35
 
36
 
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 198436 $")
 
36
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 209234 $")
37
37
 
38
38
#include <termios.h>
39
39
#include <sys/time.h>
659
659
                        /* add the message to the message queue */
660
660
                        md_msg->timestamp = ast_tvnow();
661
661
                        ast_smdi_md_message_push(iface, md_msg);
662
 
                        ast_log(LOG_DEBUG, "Recieved SMDI MD message on %s\n", iface->name);
 
662
                        ast_log(LOG_DEBUG, "Received SMDI MD message on %s\n", iface->name);
663
663
                        
664
664
                        ASTOBJ_UNREF(md_msg, ast_smdi_md_message_destroy);
665
665
 
708
708
                        /* add the message to the message queue */
709
709
                        mwi_msg->timestamp = ast_tvnow();
710
710
                        ast_smdi_mwi_message_push(iface, mwi_msg);
711
 
                        ast_log(LOG_DEBUG, "Recieved SMDI MWI message on %s\n", iface->name);
 
711
                        ast_log(LOG_DEBUG, "Received SMDI MWI message on %s\n", iface->name);
712
712
                        
713
713
                        ASTOBJ_UNREF(mwi_msg, ast_smdi_mwi_message_destroy);
714
714
                } else {
715
 
                        ast_log(LOG_ERROR, "Unknown SMDI message type recieved on %s (M%c).\n", iface->name, c);
 
715
                        ast_log(LOG_ERROR, "Unknown SMDI message type received on %s (M%c).\n", iface->name, c);
716
716
                        start = 0;
717
717
                }
718
718
        }
1044
1044
                                ASTOBJ_UNREF(iface, ast_smdi_interface_destroy);
1045
1045
 
1046
1046
                        if (!(iface = ASTOBJ_CONTAINER_FIND(&smdi_ifaces, v->value))) {
1047
 
                                ast_log(LOG_NOTICE, "SMDI interface %s not found\n", iface->name);
 
1047
                                ast_log(LOG_NOTICE, "SMDI interface %s not found\n", v->value);
1048
1048
                                continue;
1049
1049
                        }
1050
1050
                } else if (!strcasecmp(v->name, "pollinginterval")) {