diff options
| -rwxr-xr-x | ChangeLog | 2 | ||||
| -rwxr-xr-x | cdr/cdr_csv.c | 15 | ||||
| -rwxr-xr-x | cdr/cdr_custom.c | 15 | ||||
| -rwxr-xr-x | channels/chan_iax2.c | 57 | ||||
| -rwxr-xr-x | channels/iax2-parser.c | 9 | ||||
| -rwxr-xr-x | channels/iax2-provision.c | 19 | ||||
| -rwxr-xr-x | funcs/pbx_functions.c | 1 |
7 files changed, 60 insertions, 58 deletions
@@ -1,5 +1,7 @@ 2005-11-10 Kevin P. Fleming <kpfleming@digium.com> + * many files: ensure that system headers are included before Asterisk headers (issue #5693) + * channels/chan_iax2.c (complete_iax2_show_peer): don't return from function without releasing lock (issue #5685) * channels/iax2-provision.c (iax_provision_reload): don't leak memory (issue #5700) diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c index 63beb3dcb..457759053 100755 --- a/cdr/cdr_csv.c +++ b/cdr/cdr_csv.c @@ -27,6 +27,13 @@ */ #include <sys/types.h> +#include <stdio.h> +#include <string.h> +#include <errno.h> + +#include <stdlib.h> +#include <unistd.h> +#include <time.h> #include "asterisk.h" @@ -46,14 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") /* #define CSV_LOGUNIQUEID 1 */ /* #define CSV_LOGUSERFIELD 1 */ -#include <stdio.h> -#include <string.h> -#include <errno.h> - -#include <stdlib.h> -#include <unistd.h> -#include <time.h> - /*---------------------------------------------------- The values are as follows: diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c index 0658c8e44..64fddb368 100755 --- a/cdr/cdr_custom.c +++ b/cdr/cdr_custom.c @@ -29,6 +29,13 @@ */ #include <sys/types.h> +#include <stdio.h> +#include <string.h> +#include <errno.h> + +#include <stdlib.h> +#include <unistd.h> +#include <time.h> #include "asterisk.h" @@ -46,14 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define DATE_FORMAT "%Y-%m-%d %T" -#include <stdio.h> -#include <string.h> -#include <errno.h> - -#include <stdlib.h> -#include <unistd.h> -#include <time.h> - AST_MUTEX_DEFINE_STATIC(lock); static char *desc = "Customizable Comma Separated Values CDR Backend"; diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index d601fc05d..c6df0fd3d 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -26,6 +26,35 @@ * \ingroup channel_drivers */ +#include <sys/mman.h> +#include <arpa/inet.h> +#include <dirent.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <sys/time.h> +#include <sys/signal.h> +#include <signal.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <errno.h> +#include <unistd.h> +#include <netdb.h> +#include <fcntl.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <regex.h> +#ifdef IAX_TRUNKING +#include <sys/ioctl.h> +#ifdef __linux__ +#include <linux/zaptel.h> +#else +#include <zaptel.h> +#endif /* __linux__ */ +#endif + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -60,34 +89,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/devicestate.h" #include "asterisk/netsock.h" -#include <sys/mman.h> -#include <arpa/inet.h> -#include <dirent.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/ip.h> -#include <sys/time.h> -#include <sys/signal.h> -#include <signal.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <errno.h> -#include <unistd.h> -#include <netdb.h> -#include <fcntl.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <regex.h> -#ifdef IAX_TRUNKING -#include <sys/ioctl.h> -#ifdef __linux__ -#include <linux/zaptel.h> -#else -#include <zaptel.h> -#endif /* __linux__ */ -#endif #include "iax2.h" #include "iax2-parser.h" #include "iax2-provision.h" diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c index fbb4d0155..3ef80a39c 100755 --- a/channels/iax2-parser.c +++ b/channels/iax2-parser.c @@ -26,6 +26,10 @@ #include <sys/socket.h> #include <string.h> #include <netinet/in.h> +#include <arpa/inet.h> +#include <unistd.h> +#include <stdlib.h> +#include <stdio.h> #include "asterisk.h" @@ -34,15 +38,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/frame.h" #include "asterisk/utils.h" #include "asterisk/unaligned.h" -#include <arpa/inet.h> -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> #include "iax2.h" #include "iax2-parser.h" #include "iax2-provision.h" - static int frames = 0; static int iframes = 0; static int oframes = 0; diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c index c9a803bfa..c1b6f4b3d 100755 --- a/channels/iax2-provision.c +++ b/channels/iax2-provision.c @@ -21,6 +21,16 @@ * */ +#include <unistd.h> +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <netdb.h> +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <sys/socket.h> + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -33,16 +43,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/options.h" #include "asterisk/md5.h" #include "asterisk/astdb.h" -#include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/ip.h> -#include <sys/socket.h> #include "asterisk/utils.h" -#include <unistd.h> -#include <stdlib.h> -#include <string.h> -#include <stdio.h> -#include <netdb.h> #include "iax2.h" #include "iax2-provision.h" #include "iax2-parser.h" diff --git a/funcs/pbx_functions.c b/funcs/pbx_functions.c index f9422bf95..2d5c519c9 100755 --- a/funcs/pbx_functions.c +++ b/funcs/pbx_functions.c @@ -24,6 +24,7 @@ #include <sys/types.h> #include <stdlib.h> +#include <stdio.h> #include "asterisk.h" |