diff options
author | Sean Bright <sean@malleable.com> | 2013-01-29 22:58:33 +0000 |
---|---|---|
committer | Sean Bright <sean@malleable.com> | 2013-01-29 22:58:33 +0000 |
commit | 693d609081031d17e57cc2b3ad7408947120dc48 (patch) | |
tree | 8057900da93bb4d8111512cf3d4e17475996ff29 | |
parent | ffaf79b1eb7e7a91d2262b5e981ed4fa7142f9a9 (diff) |
Move the ancillary iax2 source files into a separate sub-directory.
This patch just moves the IAX2 source and header files into a separate iax2
sub-directory in the channels directory, similar to how the sip source files are
structured.
The only thing that was added was an #ifndef to protect provision.h from multiple
inclusion.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@380433 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | channels/Makefile | 5 | ||||
-rw-r--r-- | channels/chan_iax2.c | 6 | ||||
-rw-r--r-- | channels/iax2/include/iax2.h (renamed from channels/iax2.h) | 0 | ||||
-rw-r--r-- | channels/iax2/include/parser.h (renamed from channels/iax2-parser.h) | 0 | ||||
-rw-r--r-- | channels/iax2/include/provision.h (renamed from channels/iax2-provision.h) | 7 | ||||
-rw-r--r-- | channels/iax2/parser.c (renamed from channels/iax2-parser.c) | 6 | ||||
-rw-r--r-- | channels/iax2/provision.c (renamed from channels/iax2-provision.c) | 7 |
7 files changed, 19 insertions, 12 deletions
diff --git a/channels/Makefile b/channels/Makefile index 286f9d8ca..ae5a0645a 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -64,13 +64,14 @@ endif clean:: $(MAKE) -C misdn clean rm -f sip/*.o sip/*.i + rm -f iax2/*.o iax2/*.i rm -f h323/libchanh323.a h323/Makefile.ast h323/*.o h323/*.dep dist-clean:: rm -f h323/Makefile -$(if $(filter chan_iax2,$(EMBEDDED_MODS)),modules.link,chan_iax2.so): iax2-parser.o iax2-provision.o -iax2-parser.o iax2-provision.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,chan_iax2) +$(if $(filter chan_iax2,$(EMBEDDED_MODS)),modules.link,chan_iax2.so): $(subst .c,.o,$(wildcard iax2/*.c)) +$(subst .c,.o,$(wildcard iax2/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,chan_iax2) $(if $(filter chan_sip,$(EMBEDDED_MODS)),modules.link,chan_sip.so): $(subst .c,.o,$(wildcard sip/*.c)) $(subst .c,.o,$(wildcard sip/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,chan_sip) $(if $(filter chan_dahdi,$(EMBEDDED_MODS)),modules.link,chan_dahdi.so): sig_analog.o sig_pri.o sig_ss7.o diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index b8ce29dd9..c45647f7b 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -102,9 +102,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/data.h" #include "asterisk/netsock2.h" -#include "iax2.h" -#include "iax2-parser.h" -#include "iax2-provision.h" +#include "iax2/include/iax2.h" +#include "iax2/include/parser.h" +#include "iax2/include/provision.h" #include "jitterbuf.h" /*** DOCUMENTATION diff --git a/channels/iax2.h b/channels/iax2/include/iax2.h index ca9ab74dd..ca9ab74dd 100644 --- a/channels/iax2.h +++ b/channels/iax2/include/iax2.h diff --git a/channels/iax2-parser.h b/channels/iax2/include/parser.h index caa121039..caa121039 100644 --- a/channels/iax2-parser.h +++ b/channels/iax2/include/parser.h diff --git a/channels/iax2-provision.h b/channels/iax2/include/provision.h index b1dfd06d0..fd5a829c3 100644 --- a/channels/iax2-provision.h +++ b/channels/iax2/include/provision.h @@ -13,7 +13,10 @@ * \brief IAX2 Provisioning protocol */ -#include "iax2-parser.h" +#ifndef __IAX2_PROVISION_H +#define __IAX2_PROVISION_H + +#include "parser.h" #define PROV_IE_USEDHCP 1 /* Presense only */ #define PROV_IE_IPADDR 2 /* 32-bit */ @@ -51,3 +54,5 @@ int iax_provision_unload(void); int iax_provision_build(struct iax_ie_data *provdata, unsigned int *signature, const char *template, int force); int iax_provision_version(unsigned int *signature, const char *template, int force); char *iax_prov_complete_template(const char *line, const char *word, int pos, int state); + +#endif diff --git a/channels/iax2-parser.c b/channels/iax2/parser.c index 27a74da07..878d70186 100644 --- a/channels/iax2-parser.c +++ b/channels/iax2/parser.c @@ -42,9 +42,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/threadstorage.h" -#include "iax2.h" -#include "iax2-parser.h" -#include "iax2-provision.h" +#include "include/iax2.h" +#include "include/parser.h" +#include "include/provision.h" static int frames = 0; static int iframes = 0; diff --git a/channels/iax2-provision.c b/channels/iax2/provision.c index a00d6f73c..78e0b1b3d 100644 --- a/channels/iax2-provision.c +++ b/channels/iax2/provision.c @@ -45,9 +45,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/astdb.h" #include "asterisk/utils.h" #include "asterisk/acl.h" -#include "iax2.h" -#include "iax2-provision.h" -#include "iax2-parser.h" + +#include "include/iax2.h" +#include "include/provision.h" +#include "include/parser.h" static int provinit = 0; |