diff options
Diffstat (limited to 'res')
-rwxr-xr-x | res/res_adsi.c | 5 | ||||
-rwxr-xr-x | res/res_agi.c | 20 | ||||
-rwxr-xr-x | res/res_config_odbc.c | 11 | ||||
-rwxr-xr-x | res/res_crypto.c | 22 | ||||
-rwxr-xr-x | res/res_features.c | 25 | ||||
-rwxr-xr-x | res/res_indications.c | 5 | ||||
-rwxr-xr-x | res/res_monitor.c | 17 | ||||
-rwxr-xr-x | res/res_musiconhold.c | 32 | ||||
-rwxr-xr-x | res/res_odbc.c | 11 | ||||
-rwxr-xr-x | res/res_osp.c | 28 |
10 files changed, 116 insertions, 60 deletions
diff --git a/res/res_adsi.c b/res/res_adsi.c index 82c05073a..fb11c368e 100755 --- a/res/res_adsi.c +++ b/res/res_adsi.c @@ -21,6 +21,11 @@ #include <unistd.h> #include <math.h> #include <errno.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include "asterisk/ulaw.h" #include "asterisk/alaw.h" #include "asterisk/callerid.h" diff --git a/res/res_agi.c b/res/res_agi.c index 726c54951..275ccf6d5 100755 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -17,13 +17,6 @@ #include <netinet/in.h> #include <netinet/tcp.h> #include <arpa/inet.h> -#include "asterisk/file.h" -#include "asterisk/logger.h" -#include "asterisk/channel.h" -#include "asterisk/pbx.h" -#include "asterisk/module.h" -#include "asterisk/astdb.h" -#include "asterisk/callerid.h" #include <math.h> #include <stdlib.h> #include <unistd.h> @@ -34,6 +27,18 @@ #include <stdio.h> #include <fcntl.h> #include <errno.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/astdb.h" +#include "asterisk/callerid.h" #include "asterisk/cli.h" #include "asterisk/logger.h" #include "asterisk/options.h" @@ -46,7 +51,6 @@ #include "asterisk/utils.h" #include "asterisk/lock.h" #include "asterisk/agi.h" -#include "asterisk.h" #ifdef SOLARIS #include "asterisk/astmm.h" #endif diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index 484741ec7..cba29fac6 100755 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -9,6 +9,14 @@ * Copyright (C) 2004 - 2005 Anthony Minessale II <anthmct@yahoo.com> */ +#include <stdlib.h> +#include <unistd.h> +#include <string.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include "asterisk/file.h" #include "asterisk/logger.h" #include "asterisk/channel.h" @@ -17,9 +25,6 @@ #include "asterisk/module.h" #include "asterisk/lock.h" #include "asterisk/options.h" -#include <stdlib.h> -#include <unistd.h> -#include <string.h> #include "asterisk/res_odbc.h" #include "asterisk/utils.h" diff --git a/res/res_crypto.c b/res/res_crypto.c index 0ca1b9e11..43936a297 100755 --- a/res/res_crypto.c +++ b/res/res_crypto.c @@ -12,6 +12,19 @@ */ #include <sys/types.h> +#include <openssl/ssl.h> +#include <openssl/err.h> +#include <stdio.h> +#include <dirent.h> +#include <string.h> +#include <errno.h> +#include <unistd.h> +#include <fcntl.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include "asterisk/file.h" #include "asterisk/channel.h" #include "asterisk/logger.h" @@ -24,15 +37,6 @@ #include "asterisk/io.h" #include "asterisk/lock.h" #include "asterisk/utils.h" -#include <openssl/ssl.h> -#include <openssl/err.h> -#include <stdio.h> -#include <dirent.h> -#include <string.h> -#include <errno.h> -#include <unistd.h> -#include <fcntl.h> -#include "asterisk.h" /* * Asterisk uses RSA keys with SHA-1 message digests for its diff --git a/res/res_features.c b/res/res_features.c index 15546c040..2765cc159 100755 --- a/res/res_features.c +++ b/res/res_features.c @@ -11,6 +11,21 @@ * the GNU General Public License */ +#include <pthread.h> +#include <stdlib.h> +#include <errno.h> +#include <unistd.h> +#include <string.h> +#include <stdlib.h> +#include <stdio.h> +#include <sys/time.h> +#include <sys/signal.h> +#include <netinet/in.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include "asterisk/lock.h" #include "asterisk/file.h" #include "asterisk/logger.h" @@ -28,16 +43,6 @@ #include "asterisk/manager.h" #include "asterisk/utils.h" #include "asterisk/adsi.h" -#include <pthread.h> -#include <stdlib.h> -#include <errno.h> -#include <unistd.h> -#include <string.h> -#include <stdlib.h> -#include <stdio.h> -#include <sys/time.h> -#include <sys/signal.h> -#include <netinet/in.h> #ifdef __AST_DEBUG_MALLOC static void FREE(void *ptr) diff --git a/res/res_indications.c b/res/res_indications.c index 0b6d74f2a..18f4072d8 100755 --- a/res/res_indications.c +++ b/res/res_indications.c @@ -21,6 +21,11 @@ #include <errno.h> #include <sys/types.h> #include <sys/stat.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include "asterisk/lock.h" #include "asterisk/file.h" #include "asterisk/cli.h" diff --git a/res/res_monitor.c b/res/res_monitor.c index 1053e9aea..80051d582 100755 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -1,3 +1,15 @@ +/* res_monitor.c + * + * Asterisk -- A telephony toolkit for Linux. + * + * Copyright (C) 2005, Digium + * + * Mark Spencer, <markster@digium.com> + * + * This program is free software, distributed under the terms of + * the GNU General Public License + */ + #include <stdio.h> #include <stdlib.h> #include <errno.h> @@ -6,6 +18,10 @@ #include <sys/stat.h> #include <libgen.h> /* dirname() */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/logger.h" @@ -18,7 +34,6 @@ #include "asterisk/app.h" #include "asterisk/utils.h" #include "asterisk/config.h" -#include "asterisk.h" AST_MUTEX_DEFINE_STATIC(monitorlock); diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 33609c442..8aeb8826c 100755 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -11,20 +11,7 @@ * the GNU General Public License */ -#include "asterisk/lock.h" -#include "asterisk/file.h" -#include "asterisk/logger.h" -#include "asterisk/channel.h" -#include "asterisk/pbx.h" -#include "asterisk/options.h" -#include "asterisk/module.h" -#include "asterisk/translate.h" -#include "asterisk/say.h" -#include "asterisk/musiconhold.h" -#include "asterisk/config.h" -#include "asterisk/utils.h" #include <stdlib.h> -#include "asterisk/cli.h" #include <errno.h> #include <unistd.h> #include <string.h> @@ -45,6 +32,25 @@ #endif #include <unistd.h> #include <sys/ioctl.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/options.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/say.h" +#include "asterisk/musiconhold.h" +#include "asterisk/config.h" +#include "asterisk/utils.h" +#include "asterisk/cli.h" + #define MAX_MOHFILES 512 #define MAX_MOHFILE_LEN 128 diff --git a/res/res_odbc.c b/res/res_odbc.c index c4955980d..14286b6f0 100755 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -9,6 +9,14 @@ * Copyright (C) 2004 - 2005 Anthony Minessale II <anthmct@yahoo.com> */ +#include <stdlib.h> +#include <unistd.h> +#include <string.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include "asterisk/file.h" #include "asterisk/logger.h" #include "asterisk/channel.h" @@ -18,9 +26,6 @@ #include "asterisk/module.h" #include "asterisk/cli.h" #include "asterisk/lock.h" -#include <stdlib.h> -#include <unistd.h> -#include <string.h> #include "asterisk/res_odbc.h" #define MAX_ODBC_HANDLES 25 diff --git a/res/res_osp.c b/res/res_osp.c index e86a2e881..ed52d8307 100755 --- a/res/res_osp.c +++ b/res/res_osp.c @@ -13,6 +13,21 @@ #include <sys/types.h> #include <osp.h> +#include <openssl/err.h> +#include <stdio.h> +#include <dirent.h> +#include <string.h> +#include <errno.h> +#include <unistd.h> +#include <fcntl.h> +#include <openssl/bio.h> +#include <openssl/pem.h> +#include <openssl/evp.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include "asterisk/file.h" #include "asterisk/channel.h" #include "asterisk/logger.h" @@ -30,19 +45,6 @@ #include "asterisk/lock.h" #include "asterisk/causes.h" #include "asterisk/callerid.h" -#include <openssl/err.h> -#include <stdio.h> -#include <dirent.h> -#include <string.h> -#include <errno.h> -#include <unistd.h> -#include <fcntl.h> -#include "asterisk.h" -#include "astconf.h" -#include <openssl/bio.h> -#include <openssl/pem.h> -#include <openssl/evp.h> - #define MAX_CERTS 10 #define MAX_SERVICEPOINTS 10 |