Better handling of optional tags in nta_agent_get_params().

darcs-hash:20051223134246-65a35-c01cfaec7c16436ab4c51a82f64e8ef8d2078be7.gz

libsofia-sip-ua/nta/nta.c

@@ -1087,6 +1087,8 @@ int agent_get_params(nta_agent_t *agent, tagi_t *tags)
 	     NTATAG_USE_SRV(agent->sa_use_srv),
 #if HAVE_SOFIA_SMIME
 	     NTATAG_SMIME(agent->sa_smime),
+#else
+	     NTATAG_SMIME(NULL),
 #endif
 	     NTATAG_SIPFLAGS(agent->sa_flags),
 	     NTATAG_RPORT(agent->sa_rport),
@@ -1095,6 +1097,8 @@ int agent_get_params(nta_agent_t *agent, tagi_t *tags)
 	     NTATAG_SIGCOMP_OPTIONS(agent->sa_sigcomp_options ?
 				    agent->sa_sigcomp_options :
 				    "sip"),
+#else
+	     NTATAG_SIGCOMP_OPTIONS(NULL),
 #endif
 	     TAG_END());
 }

libsofia-sip-ua/nta/test_nta_api.c

@@ -535,17 +535,18 @@ int api_test_params(agent_t *ag)
   TEST(preload, 2048);
 
   TEST(nta_agent_set_params(nta, 
-      		      NTATAG_SIGCOMP_OPTIONS("sip"),
-      		      TAG_END()), have_sigcomp);
+			    NTATAG_SIGCOMP_OPTIONS("sip"),
+			    TAG_END()), have_sigcomp);
   TEST(nta_agent_set_params(nta, 
-      		      NTATAG_SIGCOMP_OPTIONS(","),
-      		      TAG_END()), -have_sigcomp);
+			    NTATAG_SIGCOMP_OPTIONS(","),
+			    TAG_END()), -have_sigcomp);
   TEST(nta_agent_set_params(nta, 
-      		      NTATAG_SIGCOMP_OPTIONS("sip;dms=16384"),
-      		      TAG_END()), have_sigcomp);
+			    NTATAG_SIGCOMP_OPTIONS("sip;dms=16384"),
+			    TAG_END()), have_sigcomp);
+  s = NONE;
   TEST(nta_agent_get_params(nta, 
-      		      NTATAG_SIGCOMP_OPTIONS_REF(s),
-      		      TAG_END()), have_sigcomp);
+			    NTATAG_SIGCOMP_OPTIONS_REF(s),
+			    TAG_END()), 1);
   if (have_sigcomp)
     TEST_S(s, "sip;dms=16384");
   else