Restorered tag lists for modules.

darcs-hash:20060109110502-65a35-1812085f3ba60e19d8af166da9d6ab39cbc869df.gz

libsofia-sip-ua/nta/Makefile.am

@@ -67,3 +67,6 @@ EXTRA_DIST =		Doxyfile nta.docs sl_utils.docs \
 # Sofia specific rules
 
 include ../sofia.am
+
+# Generate list of nta tags
+TAG_DLL_FLAGS = 	LIST=nta_tag_list
\ No newline at end of file

libsofia-sip-ua/nta/nta_tag.h

@@ -52,6 +52,9 @@
 
 SOFIA_BEGIN_DECLS
 
+/** List of all nta tags. */
+NTA_DLL extern tag_type_t nta_tag_list[];
+
 /** Filter tag matching any nta tag. */
 #define NTATAG_ANY()         ntatag_any, ((tag_value_t)0)
 NTA_DLL extern tag_typedef_t ntatag_any;

libsofia-sip-ua/nth/nth_tag.h

@@ -55,6 +55,9 @@ SOFIA_BEGIN_DECLS
 #endif
 #endif
 
+/** List of all nth tags */
+NTH_DLL extern tagi_t nth_client_tags[];
+
 /** Filter tag matching any nth tag. */
 #define NTHTAG_ANY()         nthtag_any, ((tag_value_t)0)
 NTH_DLL extern tag_typedef_t nthtag_any;

libsofia-sip-ua/nua/Makefile.am

@@ -71,3 +71,5 @@ EXTRA_DIST =		Doxyfile nua.docs $(BUILT_SOURCES)
 # Sofia specific rules
 
 include ../sofia.am
+
+TAG_DLL_FLAGS =		LIST=nua_tag_list

libsofia-sip-ua/nua/nua_tag.h

@@ -63,6 +63,9 @@ typedef struct nua_s nua_t;
 /** NUA transaction handle. */
 typedef struct nua_handle_s nua_handle_t;
 
+/** List of all NUA tags. */
+extern tag_type_t nua_tag_list[];
+
 /** Filter tag matching any nua tag. */
 #define NUTAG_ANY()          nutag_any, ((tag_value_t)0)
 extern tag_typedef_t nutag_any;

libsofia-sip-ua/sip/sip_tag.c.in

@@ -77,3 +77,16 @@ tag_typedef_t siptag_#xxxxxx# = SIPHDRTAG_TYPEDEF(#xxxxxx#);
  */
 tag_typedef_t siptag_#xxxxxx#_str = SIPSTRTAG_TYPEDEF(#xxxxxx#);
 
+/** List of all tags for SIP headers */
+tag_type_t sip_tag_list[] =
+{
+  siptag_#xxxxxx#,
+  NULL
+};
+
+/** List of all string tags for SIP headers  */
+tag_type_t sip_tag_str_list[] = 
+{
+  siptag_#xxxxxx#_str,
+  NULL
+};

libsofia-sip-ua/sip/sip_tag.h.in

@@ -76,6 +76,9 @@ SIP_DLL extern tag_class_t sipstrtag_class[1];
 /** Tag class for SIP message */
 SIP_DLL extern tag_class_t sipmsgtag_class[1];
 
+/** Lists of SIP tags. */
+SIP_DLL extern tag_type_t sip_tag_list[], sip_tag_str_list[];
+
 /** Filter tag matching any sip tag. */
 #define SIPTAG_ANY()         siptag_any, ((tag_value_t)0)
 SIP_DLL extern tag_typedef_t siptag_any;

libsofia-sip-ua/soa/Makefile.am

@@ -48,3 +48,5 @@ EXTRA_DIST =		Doxyfile soa.docs $(BUILT_SOURCES)
 # Sofia specific rules
 
 include ../sofia.am
+
+TAG_DLL_FLAGS =		LIST=soa_tag_list
\ No newline at end of file

libsofia-sip-ua/soa/soa_tag.h

@@ -40,6 +40,9 @@
 
 SOFIA_BEGIN_DECLS
 
+/** List of base SOA tags (defined in base SOA module). */
+extern tagi_t soa_tag_list[];
+
 /** Filter tag matching any soa tag. */
 #define SOATAG_ANY()         soatag_any, ((tag_value_t)0)
 extern tag_typedef_t soatag_any;

libsofia-sip-ua/stun/Makefile.am

@@ -24,7 +24,6 @@ stun_prog_targets =
 endif
 
 noinst_LTLIBRARIES = 	libstun.la
-
 noinst_PROGRAMS = 	${stun_prog_targets}
 
 # ----------------------------------------------------------------------
@@ -48,12 +47,21 @@ torture_stun_LDFLAGS = 	-static
 # XXX: torture_stun cannot be used as a automake test as is
 #TESTS = 		torture_stun
 
+# ----------------------------------------------------------------------
+# tests
+# XXX: torture_stun cannot be used as a automake test as is
+#TESTS = 		torture_stun
+
 # ----------------------------------------------------------------------
 # Install and distribution rules
 
 # ----------------------------------------------------------------------
 # Sofia specific rules
+# XXX: torture_stun cannot be used as a automake test as is
+#TESTS = 		torture_stun
 
 include ../sofia.am
 
 TAG_DLL_FLAGS =		LIST=stun_tag_list
+
+TAG_DLL_FLAGS =		LIST=stun_tag_list

libsofia-sip-ua/su/tag_dll.awk

@@ -117,8 +117,8 @@ DEFS && /tag_typedef_t/ {
   typedefs[tag] = $0;
 
   if ($0 !~ /NSTAG_TYPEDEF/) {
-    print "EXPORT tag_typedef_t "tag"_ref;" > DLL;
     print "extern tag_typedef_t "tag";" > REF;
+    print "EXPORT tag_typedef_t "tag"_ref;" > DLL;
     print "EXPORT tag_typedef_t "tag"_ref = \n  REFTAG_TYPEDEF("tag");" > REF;
   }
 
@@ -132,8 +132,10 @@ END {
     print "\nEXPORT tag_type_t " LIST "[] =\n{" > REF;
     print "\nEXPORT tag_type_t " LIST "[] =\n{" > DLL; 
     for (tag in typedefs) {
-      print "  " tag "," > REF;
-      print "  " tag "," > DLL;
+      if (typedefs[tag] !~ /NSTAG_TYPEDEF/) {
+        print "  " tag "," > REF;
+        print "  " tag "," > DLL;
+      }
     }
     print "  NULL\n};" > REF;
     print "  NULL\n};" > DLL;

libsofia-sip-ua/tport/tport_tag.h

@@ -47,7 +47,10 @@
 
 SOFIA_BEGIN_DECLS
 
-/** Filter matcing any tport tag. */
+/** List of all tport tags. */
+TPORT_DLL extern tagi_t tport_tag_list[];
+
+/** Filter list matching any tport tag. */
 TPORT_DLL extern tagi_t tport_tags[];
 
 /** Filter tag matching any tport tag. */

utils/Makefile.am

@@ -8,7 +8,10 @@ sofiasrc=$(top_srcdir)/libsofia-sip-ua
 INCLUDES = 	-I$(sofiasrc)/features \
 		-I$(sofiasrc)/ipt \
 		-I$(sofiasrc)/iptsec \
+		-I$(sofiasrc)/bnf \
+		-I$(sofiasrc)/http \
 		-I$(sofiasrc)/msg \
+		-I$(sofiasrc)/nth \
 		-I$(sofiasrc)/nta \
 		-I$(sofiasrc)/nea \
 		-I$(sofiasrc)/nua \
@@ -18,6 +21,7 @@ INCLUDES = 	-I$(sofiasrc)/features \
 		-I$(sofiasrc)/soa \
 		-I$(sofiasrc)/sresolv \
 		-I$(sofiasrc)/tport \
+		-I$(sofiasrc)/stun \
 		-I$(sofiasrc)/url \
 		-I$(sofiasrc)/su