diff options
-rwxr-xr-x | acl.c | 22 | ||||
-rwxr-xr-x | app.c | 1 | ||||
-rwxr-xr-x | ast_expr.y | 1 | ||||
-rwxr-xr-x | asterisk.c | 39 | ||||
-rwxr-xr-x | astmm.c | 1 | ||||
-rwxr-xr-x | autoservice.c | 1 | ||||
-rwxr-xr-x | callerid.c | 1 | ||||
-rwxr-xr-x | cdr.c | 7 | ||||
-rwxr-xr-x | channel.c | 24 | ||||
-rwxr-xr-x | cli.c | 11 | ||||
-rwxr-xr-x | config.c | 1 | ||||
-rwxr-xr-x | config_old.c | 1 | ||||
-rwxr-xr-x | db.c | 1 | ||||
-rwxr-xr-x | dlfcn.c | 1 | ||||
-rwxr-xr-x | dsp.c | 13 | ||||
-rwxr-xr-x | file.c | 19 | ||||
-rwxr-xr-x | frame.c | 11 | ||||
-rwxr-xr-x | fskmodem.c | 4 | ||||
-rwxr-xr-x | image.c | 1 | ||||
-rwxr-xr-x | indications.c | 1 | ||||
-rwxr-xr-x | io.c | 1 | ||||
-rwxr-xr-x | jitterbuf.c | 3 | ||||
-rwxr-xr-x | loader.c | 1 | ||||
-rwxr-xr-x | logger.c | 16 | ||||
-rwxr-xr-x | md5.c | 1 | ||||
-rwxr-xr-x | muted.c | 1 | ||||
-rwxr-xr-x | pbx.c | 19 | ||||
-rwxr-xr-x | say.c | 10 | ||||
-rwxr-xr-x | strcompat.c | 3 | ||||
-rwxr-xr-x | tdd.c | 2 | ||||
-rwxr-xr-x | term.c | 1 | ||||
-rwxr-xr-x | translate.c | 13 | ||||
-rwxr-xr-x | utils.c | 1 |
33 files changed, 134 insertions, 99 deletions
@@ -18,13 +18,6 @@ #include <signal.h> #include <errno.h> #include <unistd.h> -#include "asterisk/acl.h" -#include "asterisk/logger.h" -#include "asterisk/channel.h" -#include "asterisk/options.h" -#include "asterisk/utils.h" -#include "asterisk/lock.h" -#include "asterisk/srv.h" #include <arpa/inet.h> #include <sys/socket.h> #include <netdb.h> @@ -32,17 +25,28 @@ #include <netinet/in_systm.h> #include <netinet/ip.h> #include <sys/ioctl.h> + #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) #include <fcntl.h> #include <net/route.h> - -AST_MUTEX_DEFINE_STATIC(routeseq_lock); #endif #if defined (SOLARIS) #include <sys/sockio.h> #endif +#include "asterisk/acl.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/srv.h" + +#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) +AST_MUTEX_DEFINE_STATIC(routeseq_lock); +#endif + struct ast_netsock { ASTOBJ_COMPONENTS(struct ast_netsock); struct sockaddr_in bindaddr; @@ -22,6 +22,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <regex.h> + #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/file.h" diff --git a/ast_expr.y b/ast_expr.y index de07a0c9d..e11791462 100755 --- a/ast_expr.y +++ b/ast_expr.y @@ -21,6 +21,7 @@ #include <errno.h> #include <regex.h> #include <limits.h> + #include "asterisk/ast_expr.h" #include "asterisk/logger.h" diff --git a/asterisk.c b/asterisk.c index 589ec447f..f7d9b5625 100755 --- a/asterisk.c +++ b/asterisk.c @@ -13,6 +13,26 @@ #include <unistd.h> #include <stdlib.h> +#include <sys/resource.h> +#include <fcntl.h> +#include <stdio.h> +#include <signal.h> +#include <sched.h> +#include <sys/socket.h> +#include <sys/un.h> +#include <sys/wait.h> +#include <string.h> +#include <errno.h> +#include <ctype.h> +#include <sys/resource.h> +#include <grp.h> +#include <pwd.h> +#include <sys/stat.h> + +#if defined(__FreeBSD__) || defined( __NetBSD__ ) || defined(SOLARIS) +#include <netdb.h> +#endif + #include "asterisk/logger.h" #include "asterisk/options.h" #include "asterisk/cli.h" @@ -32,30 +52,11 @@ #include "asterisk/lock.h" #include "asterisk/utils.h" #include "asterisk/file.h" -#include <sys/resource.h> -#include <fcntl.h> -#include <stdio.h> -#include <signal.h> -#include <sched.h> #include "asterisk/io.h" #include "asterisk/lock.h" -#include <sys/socket.h> -#include <sys/un.h> -#include <sys/wait.h> -#include <string.h> -#include <errno.h> -#include <ctype.h> #include "editline/histedit.h" #include "asterisk.h" #include "asterisk/config.h" -#include <sys/resource.h> -#include <grp.h> -#include <pwd.h> -#include <sys/stat.h> - -#if defined(__FreeBSD__) || defined( __NetBSD__ ) || defined(SOLARIS) -#include <netdb.h> -#endif #ifndef AF_LOCAL #define AF_LOCAL AF_UNIX @@ -19,6 +19,7 @@ #include <stdio.h> #include <string.h> #include <time.h> + #include "asterisk/cli.h" #include "asterisk/logger.h" #include "asterisk/options.h" diff --git a/autoservice.c b/autoservice.c index 0d9d1b2f5..25c9ae887 100755 --- a/autoservice.c +++ b/autoservice.c @@ -19,6 +19,7 @@ #include <errno.h> #include <unistd.h> #include <math.h> /* For PI */ + #include "asterisk/pbx.h" #include "asterisk/frame.h" #include "asterisk/sched.h" diff --git a/callerid.c b/callerid.c index 9e5c78731..430f3cedc 100755 --- a/callerid.c +++ b/callerid.c @@ -21,6 +21,7 @@ #include <unistd.h> #include <math.h> #include <ctype.h> + #include "asterisk/ulaw.h" #include "asterisk/alaw.h" #include "asterisk/frame.h" @@ -14,6 +14,10 @@ * */ +#include <unistd.h> +#include <stdlib.h> +#include <string.h> + #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/cdr.h" @@ -22,9 +26,6 @@ #include "asterisk/causes.h" #include "asterisk/options.h" #include "asterisk/utils.h" -#include <unistd.h> -#include <stdlib.h> -#include <string.h> int ast_default_amaflags = AST_CDR_DOCUMENTATION; char ast_default_accountcode[20] = ""; @@ -19,6 +19,19 @@ #include <errno.h> #include <unistd.h> #include <math.h> /* For PI */ + +#ifdef ZAPTEL_OPTIMIZATIONS +#include <sys/ioctl.h> +#ifdef __linux__ +#include <linux/zaptel.h> +#else +#include <zaptel.h> +#endif /* __linux__ */ +#ifndef ZT_TIMERPING +#error "You need newer zaptel! Please cvs update zaptel" +#endif +#endif + #include "asterisk/pbx.h" #include "asterisk/frame.h" #include "asterisk/sched.h" @@ -40,17 +53,6 @@ #include "asterisk/lock.h" #include "asterisk/app.h" #include "asterisk/transcap.h" -#ifdef ZAPTEL_OPTIMIZATIONS -#include <sys/ioctl.h> -#ifdef __linux__ -#include <linux/zaptel.h> -#else -#include <zaptel.h> -#endif /* __linux__ */ -#ifndef ZT_TIMERPING -#error "You need newer zaptel! Please cvs update zaptel" -#endif -#endif #include "asterisk.h" /* uncomment if you have problems with 'monitoring' synchronized files */ @@ -13,6 +13,12 @@ #include <unistd.h> #include <stdlib.h> +#include <sys/signal.h> +#include <stdio.h> +#include <signal.h> +#include <string.h> +#include <ctype.h> + #include "asterisk/logger.h" #include "asterisk/options.h" #include "asterisk/cli.h" @@ -22,11 +28,6 @@ #include "asterisk/manager.h" #include "asterisk/utils.h" #include "asterisk/lock.h" -#include <sys/signal.h> -#include <stdio.h> -#include <signal.h> -#include <string.h> -#include <ctype.h> /* For rl_filename_completion */ #include "editline/readline/readline.h" /* For module directory */ @@ -24,6 +24,7 @@ #endif # include <glob.h> #endif + #include "asterisk/config.h" #include "asterisk/cli.h" #include "asterisk/lock.h" diff --git a/config_old.c b/config_old.c index c2d8cdf3b..1c8a91290 100755 --- a/config_old.c +++ b/config_old.c @@ -16,6 +16,7 @@ #include <stdlib.h> #include <string.h> #include <errno.h> + #include "asterisk/config.h" #include "asterisk/logger.h" @@ -23,6 +23,7 @@ #include <errno.h> #include <unistd.h> #include <dirent.h> + #include "asterisk/channel.h" #include "asterisk/file.h" #include "asterisk/app.h" @@ -47,6 +47,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __BSD_VISIBLE #define __BSD_VISIBLE 1 #endif + #include "asterisk/dlfcn-compat.h" #ifndef dl_restrict @@ -29,12 +29,6 @@ */ #include <sys/types.h> -#include "asterisk/frame.h" -#include "asterisk/channel.h" -#include "asterisk/logger.h" -#include "asterisk/dsp.h" -#include "asterisk/ulaw.h" -#include "asterisk/alaw.h" #include <stdlib.h> #include <unistd.h> #include <string.h> @@ -42,6 +36,13 @@ #include <errno.h> #include <stdio.h> +#include "asterisk/frame.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/dsp.h" +#include "asterisk/ulaw.h" +#include "asterisk/alaw.h" + /* Number of goertzels for progress detect */ #define GSAMP_SIZE_NA 183 /* North America - 350, 440, 480, 620, 950, 1400, 1800 Hz */ #define GSAMP_SIZE_CR 188 /* Costa Rica, Brazil - Only care about 425 Hz */ @@ -12,6 +12,16 @@ */ #include <sys/types.h> +#include <errno.h> +#include <unistd.h> +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <fcntl.h> +#include <dirent.h> +#include <sys/types.h> +#include <sys/stat.h> + #include "asterisk/frame.h" #include "asterisk/file.h" #include "asterisk/cli.h" @@ -23,15 +33,6 @@ #include "asterisk/utils.h" #include "asterisk/lock.h" #include "asterisk/app.h" -#include <errno.h> -#include <unistd.h> -#include <stdlib.h> -#include <string.h> -#include <stdio.h> -#include <fcntl.h> -#include <dirent.h> -#include <sys/types.h> -#include <sys/stat.h> #include "asterisk.h" #include "astconf.h" @@ -11,6 +11,12 @@ * the GNU General Public License */ +#include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include <errno.h> +#include <stdio.h> + #include "asterisk/lock.h" #include "asterisk/frame.h" #include "asterisk/logger.h" @@ -19,11 +25,6 @@ #include "asterisk/cli.h" #include "asterisk/term.h" #include "asterisk/utils.h" -#include <stdlib.h> -#include <unistd.h> -#include <string.h> -#include <errno.h> -#include <stdio.h> #include "asterisk.h" #ifdef TRACE_FRAMES diff --git a/fskmodem.c b/fskmodem.c index 76cc7b141..3086edc46 100755 --- a/fskmodem.c +++ b/fskmodem.c @@ -14,10 +14,10 @@ * */ -#include "asterisk/fskmodem.h" - #include <stdio.h> +#include "asterisk/fskmodem.h" + #define NBW 2 #define BWLIST {75,800} #define NF 6 @@ -19,6 +19,7 @@ #include <signal.h> #include <errno.h> #include <unistd.h> + #include "asterisk/sched.h" #include "asterisk/options.h" #include "asterisk/channel.h" diff --git a/indications.c b/indications.c index 0f93e458c..4867fd4bd 100755 --- a/indications.c +++ b/indications.c @@ -20,6 +20,7 @@ #include <stdlib.h> #include <string.h> #include <math.h> /* For PI */ + #include "asterisk/indications.h" #include "asterisk/frame.h" #include "asterisk/options.h" @@ -17,6 +17,7 @@ #include <termios.h> #include <string.h> /* for memset */ #include <sys/ioctl.h> + #include "asterisk/io.h" #include "asterisk/logger.h" diff --git a/jitterbuf.c b/jitterbuf.c index a7668e17e..365ec44f0 100755 --- a/jitterbuf.c +++ b/jitterbuf.c @@ -13,11 +13,12 @@ * Copyright on this file is disclaimed to Digium for inclusion in Asterisk */ -#include "jitterbuf.h" #include <stdio.h> #include <stdlib.h> #include <string.h> +#include "jitterbuf.h" + /* define these here, just for ancient compiler systems */ #define JB_LONGMAX 2147483647L #define JB_LONGMIN (-JB_LONGMAX - 1L) @@ -16,6 +16,7 @@ #include <unistd.h> #include <stdlib.h> #include <string.h> + #include "asterisk/module.h" #include "asterisk/options.h" #include "asterisk/config.h" @@ -16,6 +16,15 @@ #include <stdio.h> #include <unistd.h> #include <time.h> +#include <string.h> +#include <stdlib.h> +#include <errno.h> +#include <sys/stat.h> + +#define SYSLOG_NAMES /* so we can map syslog facilities names to their numeric values, + from <syslog.h> which is included by logger.h */ +#include <syslog.h> + #include "asterisk/lock.h" #include "asterisk/options.h" #include "asterisk/channel.h" @@ -24,16 +33,9 @@ #include "asterisk/cli.h" #include "asterisk/utils.h" #include "asterisk/manager.h" -#include <string.h> -#include <stdlib.h> -#include <errno.h> -#include <sys/stat.h> #include "asterisk.h" #include "astconf.h" -#define SYSLOG_NAMES /* so we can map syslog facilities names to their numeric values, - from <syslog.h> which is included by logger.h */ -#include <syslog.h> static int syslog_level_map[] = { LOG_DEBUG, LOG_INFO, /* arbitrary equivalent of LOG_EVENT */ @@ -18,6 +18,7 @@ * will fill a supplied 16-byte array with the digest. */ #include <string.h> /* for memcpy() */ + #include "asterisk/endian.h" #include "asterisk/md5.h" @@ -10,6 +10,7 @@ * Distributed under the terms of the GNU General Public License version 2.0 * */ + #include <linux/soundcard.h> #include <stdio.h> #include <errno.h> @@ -13,6 +13,16 @@ #include <sys/types.h> #include <regex.h> +#include <string.h> +#include <unistd.h> +#include <stdlib.h> +#include <stdio.h> +#include <setjmp.h> +#include <ctype.h> +#include <errno.h> +#include <time.h> +#include <sys/time.h> + #include "asterisk/lock.h" #include "asterisk/cli.h" #include "asterisk/pbx.h" @@ -32,15 +42,6 @@ #include "asterisk/causes.h" #include "asterisk/musiconhold.h" #include "asterisk/app.h" -#include <string.h> -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <setjmp.h> -#include <ctype.h> -#include <errno.h> -#include <time.h> -#include <sys/time.h> #include "asterisk.h" /* @@ -21,6 +21,11 @@ #include <time.h> #include <ctype.h> #include <math.h> + +#ifdef SOLARIS +#include <iso/limits_iso.h> +#endif + #include "asterisk/file.h" #include "asterisk/channel.h" #include "asterisk/logger.h" @@ -31,11 +36,6 @@ #include "asterisk.h" #include <stdio.h> -#ifdef SOLARIS -#include <iso/limits_iso.h> -#endif - - /* Forward declaration */ static int wait_file(struct ast_channel *chan, const char *ints, const char *file, const char *lang); diff --git a/strcompat.c b/strcompat.c index b8f9f0e49..1814dcd12 100755 --- a/strcompat.c +++ b/strcompat.c @@ -2,8 +2,9 @@ #include <sys/types.h> #include <stdio.h> + #ifdef SOLARIS -#include <solaris-compat/compat.h> +#include "solaris-compat/compat.h" #endif char* strsep(char** str, const char* delims) @@ -21,13 +21,13 @@ #include <unistd.h> #include <math.h> #include <ctype.h> + #include "asterisk/ulaw.h" #include "asterisk/tdd.h" #include "asterisk/logger.h" #include "asterisk/fskmodem.h" #include "ecdisa.h" - struct tdd_state { fsk_data fskd; char rawdata[256]; @@ -21,6 +21,7 @@ #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> + #include "asterisk/term.h" #include "asterisk/options.h" #include "asterisk/lock.h" diff --git a/translate.c b/translate.c index 97ece832a..492ebb8e1 100755 --- a/translate.c +++ b/translate.c @@ -11,6 +11,13 @@ * the GNU General Public License */ +#include <sys/socket.h> +#include <sys/time.h> +#include <unistd.h> +#include <stdlib.h> +#include <string.h> +#include <stdio.h> + #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/logger.h" @@ -20,12 +27,6 @@ #include "asterisk/sched.h" #include "asterisk/cli.h" #include "asterisk/term.h" -#include <sys/socket.h> -#include <sys/time.h> -#include <unistd.h> -#include <stdlib.h> -#include <string.h> -#include <stdio.h> #define MAX_RECALC 200 /* max sample recalc */ @@ -22,6 +22,7 @@ #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> + #include "asterisk/lock.h" #include "asterisk/utils.h" #include "asterisk/io.h" |