diff options
Diffstat (limited to 'channels')
-rwxr-xr-x | channels/chan_agent.c | 21 | ||||
-rwxr-xr-x | channels/chan_alsa.c | 27 | ||||
-rwxr-xr-x | channels/chan_features.c | 22 | ||||
-rwxr-xr-x | channels/chan_h323.c | 5 | ||||
-rwxr-xr-x | channels/chan_iax2.c | 4 | ||||
-rwxr-xr-x | channels/chan_local.c | 21 | ||||
-rwxr-xr-x | channels/chan_mgcp.c | 34 | ||||
-rwxr-xr-x | channels/chan_modem.c | 23 | ||||
-rwxr-xr-x | channels/chan_modem_aopen.c | 5 | ||||
-rwxr-xr-x | channels/chan_modem_bestdata.c | 5 | ||||
-rwxr-xr-x | channels/chan_modem_i4l.c | 5 | ||||
-rwxr-xr-x | channels/chan_nbs.c | 19 | ||||
-rwxr-xr-x | channels/chan_oss.c | 30 | ||||
-rwxr-xr-x | channels/chan_phone.c | 25 | ||||
-rwxr-xr-x | channels/chan_sip.c | 33 | ||||
-rwxr-xr-x | channels/chan_skinny.c | 31 | ||||
-rwxr-xr-x | channels/chan_vpb.c | 6 | ||||
-rwxr-xr-x | channels/chan_zap.c | 55 | ||||
-rwxr-xr-x | channels/iax2-parser.c | 5 | ||||
-rwxr-xr-x | channels/iax2-provision.c | 4 |
20 files changed, 237 insertions, 143 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index f537cf4f8..102afb0f9 100755 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -13,6 +13,19 @@ #include <stdio.h> #include <string.h> +#include <sys/socket.h> +#include <errno.h> +#include <unistd.h> +#include <stdlib.h> +#include <fcntl.h> +#include <netdb.h> +#include <arpa/inet.h> +#include <sys/signal.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" @@ -35,14 +48,6 @@ #include "asterisk/utils.h" #include "asterisk/causes.h" #include "asterisk/astdb.h" -#include <sys/socket.h> -#include <errno.h> -#include <unistd.h> -#include <stdlib.h> -#include <fcntl.h> -#include <netdb.h> -#include <arpa/inet.h> -#include <sys/signal.h> static const char desc[] = "Agent Proxy Channel"; static const char channeltype[] = "Agent"; diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index 215a55ef0..9f8342920 100755 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -9,17 +9,6 @@ * the GNU General Public License */ -#include "asterisk/frame.h" -#include "asterisk/logger.h" -#include "asterisk/channel.h" -#include "asterisk/module.h" -#include "asterisk/options.h" -#include "asterisk/pbx.h" -#include "asterisk/config.h" -#include "asterisk/cli.h" -#include "asterisk/utils.h" -#include "asterisk/causes.h" -#include "asterisk/endian.h" #include <unistd.h> #include <fcntl.h> #include <errno.h> @@ -33,6 +22,22 @@ #define ALSA_PCM_NEW_SW_PARAMS_API #include <alsa/asoundlib.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/pbx.h" +#include "asterisk/config.h" +#include "asterisk/cli.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" +#include "asterisk/endian.h" + #include "busy.h" #include "ringtone.h" #include "ring10.h" diff --git a/channels/chan_features.c b/channels/chan_features.c index 6a852bc5c..03bdba706 100755 --- a/channels/chan_features.c +++ b/channels/chan_features.c @@ -13,6 +13,19 @@ #include <stdio.h> #include <string.h> +#include <sys/socket.h> +#include <errno.h> +#include <unistd.h> +#include <stdlib.h> +#include <fcntl.h> +#include <netdb.h> +#include <arpa/inet.h> +#include <sys/signal.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" @@ -31,15 +44,6 @@ #include "asterisk/app.h" #include "asterisk/musiconhold.h" #include "asterisk/manager.h" -#include <sys/socket.h> -#include <errno.h> -#include <unistd.h> -#include <stdlib.h> -#include <fcntl.h> -#include <netdb.h> -#include <arpa/inet.h> -#include <sys/signal.h> - static const char desc[] = "Feature Proxy Channel"; static const char type[] = "Feature"; diff --git a/channels/chan_h323.c b/channels/chan_h323.c index f6c9cd539..a44909859 100755 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -49,6 +49,11 @@ #ifdef __cplusplus extern "C" { #endif + +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/logger.h" #include "asterisk/channel.h" diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index bd64da658..abb9ef256 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -11,6 +11,10 @@ * the GNU General Public License */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/frame.h" #include "asterisk/channel.h" diff --git a/channels/chan_local.c b/channels/chan_local.c index bc177f676..e2e54f86c 100755 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -13,6 +13,19 @@ #include <stdio.h> #include <string.h> +#include <sys/socket.h> +#include <errno.h> +#include <unistd.h> +#include <stdlib.h> +#include <fcntl.h> +#include <netdb.h> +#include <arpa/inet.h> +#include <sys/signal.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" @@ -31,14 +44,6 @@ #include "asterisk/app.h" #include "asterisk/musiconhold.h" #include "asterisk/manager.h" -#include <sys/socket.h> -#include <errno.h> -#include <unistd.h> -#include <stdlib.h> -#include <fcntl.h> -#include <netdb.h> -#include <arpa/inet.h> -#include <sys/signal.h> static const char desc[] = "Local Proxy Channel"; static const char type[] = "Local"; diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index acac0653c..843af438d 100755 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -55,6 +55,25 @@ #include <stdio.h> #include <string.h> +#include <sys/socket.h> +#include <sys/ioctl.h> +#include <net/if.h> +#include <errno.h> +#include <unistd.h> +#include <stdlib.h> +#include <fcntl.h> +#include <netdb.h> +#include <arpa/inet.h> +#include <sys/signal.h> +#include <signal.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <ctype.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" @@ -77,22 +96,7 @@ #include "asterisk/musiconhold.h" #include "asterisk/utils.h" #include "asterisk/causes.h" -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <net/if.h> -#include <errno.h> -#include <unistd.h> -#include <stdlib.h> -#include <fcntl.h> -#include <netdb.h> -#include <arpa/inet.h> -#include <sys/signal.h> -#include <signal.h> -#include <netinet/in_systm.h> -#include <netinet/ip.h> - #include "asterisk/dsp.h" -#include <ctype.h> #ifndef IPTOS_MINCOST #define IPTOS_MINCOST 0x02 diff --git a/channels/chan_modem.c b/channels/chan_modem.c index ad80e3e48..c1e61a0bc 100755 --- a/channels/chan_modem.c +++ b/channels/chan_modem.c @@ -13,15 +13,6 @@ #include <stdio.h> #include <string.h> -#include "asterisk/lock.h" -#include "asterisk/channel.h" -#include "asterisk/config.h" -#include "asterisk/logger.h" -#include "asterisk/module.h" -#include "asterisk/pbx.h" -#include "asterisk/options.h" -#include "asterisk/vmodem.h" -#include "asterisk/utils.h" #include <sys/socket.h> #include <sys/time.h> #include <errno.h> @@ -35,6 +26,20 @@ #include <sys/signal.h> #include <ctype.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/vmodem.h" +#include "asterisk/utils.h" + /* Up to 10 seconds for an echo to arrive */ #define ECHO_TIMEOUT 10 diff --git a/channels/chan_modem_aopen.c b/channels/chan_modem_aopen.c index c14a8f6d4..ec6a35fca 100755 --- a/channels/chan_modem_aopen.c +++ b/channels/chan_modem_aopen.c @@ -16,6 +16,11 @@ #include <string.h> #include <stdlib.h> #include <errno.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/vmodem.h" #include "asterisk/module.h" diff --git a/channels/chan_modem_bestdata.c b/channels/chan_modem_bestdata.c index aff1d5df9..f1f6a90c9 100755 --- a/channels/chan_modem_bestdata.c +++ b/channels/chan_modem_bestdata.c @@ -18,6 +18,11 @@ #include <stdlib.h> #include <errno.h> #include <unistd.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/vmodem.h" #include "asterisk/module.h" diff --git a/channels/chan_modem_i4l.c b/channels/chan_modem_i4l.c index 65a28223c..92cca420a 100755 --- a/channels/chan_modem_i4l.c +++ b/channels/chan_modem_i4l.c @@ -18,6 +18,11 @@ #include <errno.h> #include <unistd.h> #include <sys/ioctl.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/vmodem.h" #include "asterisk/module.h" diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c index fb5809cc0..1c7277646 100755 --- a/channels/chan_nbs.c +++ b/channels/chan_nbs.c @@ -13,13 +13,6 @@ #include <stdio.h> #include <string.h> -#include "asterisk/lock.h" -#include "asterisk/channel.h" -#include "asterisk/config.h" -#include "asterisk/logger.h" -#include "asterisk/module.h" -#include "asterisk/pbx.h" -#include "asterisk/options.h" #include <sys/socket.h> #include <sys/time.h> #include <errno.h> @@ -30,6 +23,18 @@ #include <sys/ioctl.h> #include <nbs.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" + static const char desc[] = "Network Broadcast Sound Support"; static const char type[] = "NBS"; static const char tdesc[] = "Network Broadcast Sound Driver"; diff --git a/channels/chan_oss.c b/channels/chan_oss.c index f52da8b73..2d1344645 100755 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -15,18 +15,6 @@ * the GNU General Public License */ -#include "asterisk/lock.h" -#include "asterisk/frame.h" -#include "asterisk/logger.h" -#include "asterisk/channel.h" -#include "asterisk/module.h" -#include "asterisk/options.h" -#include "asterisk/pbx.h" -#include "asterisk/config.h" -#include "asterisk/cli.h" -#include "asterisk/utils.h" -#include "asterisk/causes.h" -#include "asterisk/endian.h" #include <unistd.h> #include <fcntl.h> #include <errno.h> @@ -43,6 +31,24 @@ #else #include <soundcard.h> #endif + +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + +#include "asterisk/lock.h" +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/pbx.h" +#include "asterisk/config.h" +#include "asterisk/cli.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" +#include "asterisk/endian.h" + #include "busy.h" #include "ringtone.h" #include "ring10.h" diff --git a/channels/chan_phone.c b/channels/chan_phone.c index dd8aa6501..513be4e38 100755 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -14,16 +14,6 @@ #include <stdio.h> #include <string.h> #include <ctype.h> -#include "asterisk/lock.h" -#include "asterisk/channel.h" -#include "asterisk/config.h" -#include "asterisk/logger.h" -#include "asterisk/module.h" -#include "asterisk/pbx.h" -#include "asterisk/options.h" -#include "asterisk/utils.h" -#include "asterisk/callerid.h" -#include "asterisk/causes.h" #include <sys/socket.h> #include <sys/time.h> #include <errno.h> @@ -39,6 +29,21 @@ # include <linux/compiler.h> #endif #include <linux/ixjuser.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" +#include "asterisk/callerid.h" +#include "asterisk/causes.h" #include "DialTone.h" #ifdef QTI_PHONEJACK_TJ_PCI /* check for the newer quicknet driver v.3.1.0 which has this symbol */ diff --git a/channels/chan_sip.c b/channels/chan_sip.c index e2cd3ac18..f677d839b 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -15,6 +15,25 @@ #include <stdio.h> #include <ctype.h> #include <string.h> +#include <sys/socket.h> +#include <sys/ioctl.h> +#include <net/if.h> +#include <errno.h> +#include <unistd.h> +#include <stdlib.h> +#include <fcntl.h> +#include <netdb.h> +#include <arpa/inet.h> +#include <signal.h> +#include <sys/signal.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <regex.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" @@ -45,20 +64,6 @@ #ifdef OSP_SUPPORT #include "asterisk/astosp.h" #endif -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <net/if.h> -#include <errno.h> -#include <unistd.h> -#include <stdlib.h> -#include <fcntl.h> -#include <netdb.h> -#include <arpa/inet.h> -#include <signal.h> -#include <sys/signal.h> -#include <netinet/in_systm.h> -#include <netinet/ip.h> -#include <regex.h> #ifndef DEFAULT_USERAGENT #define DEFAULT_USERAGENT "Asterisk PBX" diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 2b058dd46..e5fd4c92d 100755 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -16,6 +16,24 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <netinet/tcp.h> +#include <sys/ioctl.h> +#include <net/if.h> +#include <errno.h> +#include <unistd.h> +#include <fcntl.h> +#include <netdb.h> +#include <arpa/inet.h> +#include <sys/signal.h> +#include <signal.h> +#include <ctype.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" @@ -37,20 +55,7 @@ #include "asterisk/app.h" #include "asterisk/musiconhold.h" #include "asterisk/utils.h" -#include <sys/socket.h> -#include <netinet/in.h> -#include <netinet/tcp.h> -#include <sys/ioctl.h> -#include <net/if.h> -#include <errno.h> -#include <unistd.h> -#include <fcntl.h> -#include <netdb.h> -#include <arpa/inet.h> -#include <sys/signal.h> -#include <signal.h> #include "asterisk/dsp.h" -#include <ctype.h> /************************************************************************************/ /* Skinny/Asterisk Protocol Settings */ diff --git a/channels/chan_vpb.c b/channels/chan_vpb.c index ea663228b..848c2b762 100755 --- a/channels/chan_vpb.c +++ b/channels/chan_vpb.c @@ -22,6 +22,11 @@ extern "C" { #include <stdio.h> #include <string.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/utils.h" #include "asterisk/channel.h" @@ -33,7 +38,6 @@ extern "C" { #include "asterisk/callerid.h" #include "asterisk/dsp.h" #include "asterisk/features.h" - } #include <sys/socket.h> diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 14b257cb6..bd72c7181 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -13,32 +13,6 @@ #include <stdio.h> #include <string.h> -#include "asterisk/lock.h" -#include "asterisk/channel.h" -#include "asterisk/config.h" -#include "asterisk/logger.h" -#include "asterisk/module.h" -#include "asterisk/pbx.h" -#include "asterisk/options.h" -#include "asterisk/file.h" -#include "asterisk/ulaw.h" -#include "asterisk/alaw.h" -#include "asterisk/callerid.h" -#include "asterisk/adsi.h" -#include "asterisk/cli.h" -#include "asterisk/cdr.h" -#include "asterisk/features.h" -#include "asterisk/musiconhold.h" -#include "asterisk/say.h" -#include "asterisk/tdd.h" -#include "asterisk/app.h" -#include "asterisk/dsp.h" -#include "asterisk/astdb.h" -#include "asterisk/manager.h" -#include "asterisk/causes.h" -#include "asterisk/term.h" -#include "asterisk/utils.h" -#include "asterisk/transcap.h" #include <sys/signal.h> #include <errno.h> #include <stdlib.h> @@ -67,6 +41,35 @@ #include "asterisk.h" +ASTERISK_FILE_VERSION("$Revision$") + +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/file.h" +#include "asterisk/ulaw.h" +#include "asterisk/alaw.h" +#include "asterisk/callerid.h" +#include "asterisk/adsi.h" +#include "asterisk/cli.h" +#include "asterisk/cdr.h" +#include "asterisk/features.h" +#include "asterisk/musiconhold.h" +#include "asterisk/say.h" +#include "asterisk/tdd.h" +#include "asterisk/app.h" +#include "asterisk/dsp.h" +#include "asterisk/astdb.h" +#include "asterisk/manager.h" +#include "asterisk/causes.h" +#include "asterisk/term.h" +#include "asterisk/utils.h" +#include "asterisk/transcap.h" + #ifndef ZT_SIG_EM_E1 #error "Your zaptel is too old. please cvs update" #endif diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c index cb2125387..dddf1349b 100755 --- a/channels/iax2-parser.c +++ b/channels/iax2-parser.c @@ -15,6 +15,11 @@ #include <sys/socket.h> #include <string.h> #include <netinet/in.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/frame.h" #include "asterisk/utils.h" #include "asterisk/unaligned.h" diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c index f44dcba8c..143c1b521 100755 --- a/channels/iax2-provision.c +++ b/channels/iax2-provision.c @@ -12,6 +12,10 @@ * */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/config.h" #include "asterisk/logger.h" #include "asterisk/cli.h" |