move timeval-diff function into utils.h from app_alarmreceiver.c
[asterisk/asterisk.git] / apps / app_alarmreceiver.c
index ed10e55..bdf264e 100755 (executable)
  *
  */ 
  
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
-#include <asterisk/ulaw.h>
-#include <asterisk/options.h>
-#include <asterisk/app.h>
-#include <asterisk/dsp.h>
-#include <asterisk/config.h>
-#include <asterisk/localtime.h>
-#include <asterisk/callerid.h>
-#include <asterisk/astdb.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/time.h>
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/ulaw.h"
+#include "asterisk/options.h"
+#include "asterisk/app.h"
+#include "asterisk/dsp.h"
+#include "asterisk/config.h"
+#include "asterisk/localtime.h"
+#include "asterisk/callerid.h"
+#include "asterisk/astdb.h"
+
 #define ALMRCV_CONFIG "alarmreceiver.conf"
 #define ADEMCO_CONTACT_ID "ADEMCO_CONTACT_ID"
 
@@ -214,20 +219,6 @@ static int send_tone_burst(struct ast_channel *chan, float freq, int duration, i
 }
 
 /*
-* Return the difference in milliseconds between two timeval structs
-*/
-
-static int ms_diff(struct timeval *tv1, struct timeval *tv2){
-
-       int     ms;
-       
-       ms = (tv1->tv_sec - tv2->tv_sec) * 1000;
-       ms += (tv1->tv_usec - tv2->tv_usec) / 1000;
-       
-       return(ms);
-}
-
-/*
 * Receive a string of DTMF digits where the length of the digit string is known in advance. Do not give preferential
 * treatment to any digit value, and allow separate time out values to be specified for the first digit and all subsequent
 * digits.
@@ -251,7 +242,7 @@ static int receive_dtmf_digits(struct ast_channel *chan, char *digit_string, int
                gettimeofday(&now,NULL);
                
                  /* if outa time, leave */
-               if (ms_diff(&now,&lastdigittime) > 
+               if (ast_tvdiff_ms(&lastdigittime, &now) > 
                    ((i > 0) ? sdto : fdto)){
                        if(option_verbose >= 4)
                                ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: DTMF Digit Timeout on %s\n", chan->name);
@@ -747,7 +738,7 @@ static int load_config(void)
 
        /* Read in the config file */
 
-       cfg = ast_load(ALMRCV_CONFIG);
+       cfg = ast_config_load(ALMRCV_CONFIG);
                                                                                                                                   
        if(!cfg){
        
@@ -817,7 +808,7 @@ static int load_config(void)
                        strncpy(db_family, p, sizeof(db_family) - 1);
                        db_family[sizeof(db_family) - 1] = '\0';
                }
-               ast_destroy(cfg);
+               ast_config_destroy(cfg);
        }
        return 0;