[asterisk-commits] seanbright: trunk r380433 - in /trunk/channels: ./ iax2/ iax2/include/

[SVN commits to the Asterisk project]

Author: seanbright
Date: Tue Jan 29 16:58:33 2013
New Revision: 380433

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=380433
Log:
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.

Added:
    trunk/channels/iax2/
    trunk/channels/iax2/include/
    trunk/channels/iax2/include/iax2.h
      - copied unchanged from r380431, trunk/channels/iax2.h
    trunk/channels/iax2/include/parser.h
      - copied unchanged from r380431, trunk/channels/iax2-parser.h
    trunk/channels/iax2/include/provision.h
      - copied, changed from r380431, trunk/channels/iax2-provision.h
    trunk/channels/iax2/parser.c
      - copied, changed from r380431, trunk/channels/iax2-parser.c
    trunk/channels/iax2/provision.c
      - copied, changed from r380431, trunk/channels/iax2-provision.c
Removed:
    trunk/channels/iax2-parser.c
    trunk/channels/iax2-parser.h
    trunk/channels/iax2-provision.c
    trunk/channels/iax2-provision.h
    trunk/channels/iax2.h
Modified:
    trunk/channels/Makefile
    trunk/channels/chan_iax2.c

Modified: trunk/channels/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/Makefile?view=diff&rev=380433&r1=380432&r2=380433
==============================================================================
--- trunk/channels/Makefile (original)
+++ trunk/channels/Makefile Tue Jan 29 16:58:33 2013
@@ -64,13 +64,14 @@
 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

Modified: trunk/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=380433&r1=380432&r2=380433
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Tue Jan 29 16:58:33 2013
@@ -102,9 +102,9 @@
 #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

Copied: trunk/channels/iax2/include/provision.h (from r380431, trunk/channels/iax2-provision.h)
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/iax2/include/provision.h?view=diff&rev=380433&p1=trunk/channels/iax2-provision.h&r1=380431&p2=trunk/channels/iax2/include/provision.h&r2=380433
==============================================================================
--- trunk/channels/iax2-provision.h (original)
+++ trunk/channels/iax2/include/provision.h Tue Jan 29 16:58:33 2013
@@ -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_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

Copied: trunk/channels/iax2/parser.c (from r380431, trunk/channels/iax2-parser.c)
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/iax2/parser.c?view=diff&rev=380433&p1=trunk/channels/iax2-parser.c&r1=380431&p2=trunk/channels/iax2/parser.c&r2=380433
==============================================================================
--- trunk/channels/iax2-parser.c (original)
+++ trunk/channels/iax2/parser.c Tue Jan 29 16:58:33 2013
@@ -42,9 +42,9 @@
 #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;

Copied: trunk/channels/iax2/provision.c (from r380431, trunk/channels/iax2-provision.c)
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/iax2/provision.c?view=diff&rev=380433&p1=trunk/channels/iax2-provision.c&r1=380431&p2=trunk/channels/iax2/provision.c&r2=380433
==============================================================================
--- trunk/channels/iax2-provision.c (original)
+++ trunk/channels/iax2/provision.c Tue Jan 29 16:58:33 2013
@@ -45,9 +45,10 @@
 #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;