From 1bf92980a70d075619382c327e2d0e0ef2212dea Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Tue, 26 Feb 2008 18:08:51 +0000
Subject: [PATCH] Tue Feb 26 12:45:52 EST 2008  Pekka.Pessi@nokia.com   *
 test_nua.c: fixed tests

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7744 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am       | 5 +++--
 libs/sofia-sip/libsofia-sip-ua/nua/test_cancel_bye.c | 3 +++
 libs/sofia-sip/libsofia-sip-ua/nua/test_nua.h        | 5 ++++-
 libs/sofia-sip/libsofia-sip-ua/nua/test_ops.c        | 6 ++++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am
index 0a3af2a5b2..ab20e470d1 100644
--- a/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am
@@ -51,8 +51,9 @@ libtestnua_la_SOURCES = test_nua.h test_ops.c \
 			test_call_reject.c test_cancel_bye.c \
 			test_call_hold.c test_session_timer.c \
 			test_refer.c test_100rel.c \
-			test_sip_events.c test_extension.c
-#test_simple.c 
+			test_sip_events.c test_simple.c \
+			test_extension.c
+
 
 libtestproxy_la_SOURCES = test_proxy.h test_proxy.c
 
diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/test_cancel_bye.c b/libs/sofia-sip/libsofia-sip-ua/nua/test_cancel_bye.c
index 69f91dffa8..88c2ae61b1 100644
--- a/libs/sofia-sip/libsofia-sip-ua/nua/test_cancel_bye.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/test_cancel_bye.c
@@ -1433,6 +1433,9 @@ int test_bye_with_407(struct context *ctx)
   a_call->sdp = "m=audio 5008 RTP/AVP 8";
   c_call->sdp = "m=audio 5010 RTP/AVP 0 8";
 
+  if (!ctx->proxy_tests)
+    return 0;
+
 /* BYE after receiving 401
 
    A			C
diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/test_nua.h b/libs/sofia-sip/libsofia-sip-ua/nua/test_nua.h
index 1d035fcae1..5c67d014d3 100644
--- a/libs/sofia-sip/libsofia-sip-ua/nua/test_nua.h
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/test_nua.h
@@ -178,7 +178,10 @@ struct context
       unsigned bit4:1, bit5:1, bit6:1, bit7:1;
       unsigned :0;
     } flags;
-
+    /* Accross-run state information */
+    struct {
+      unsigned n;
+    } state;
   } a, b, c;
 
   struct proxy *p;
diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/test_ops.c b/libs/sofia-sip/libsofia-sip-ua/nua/test_ops.c
index 355d289adb..0c43d9bf40 100644
--- a/libs/sofia-sip/libsofia-sip-ua/nua/test_ops.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/test_ops.c
@@ -182,6 +182,12 @@ void print_event(nua_event_t event,
 	    ep->name, (void *)nh, nua_event_name(event), phrase,
 	    nua_substate_name(t ? t->t_value : 0));
   }
+  else if ((int)event >= nua_i_bye || 
+	   event == nua_i_invite || event == nua_i_cancel ||
+	   event == nua_i_ack) {
+    fprintf(stderr, "%s %s.nua(%p): event %s %03d %s\n", timestamp,
+	    ep->name, (void *)nh, nua_event_name(event), status, phrase);
+  }
   else if ((int)event >= 0) {
     fprintf(stderr, "%s %s.nua(%p): event %s %s\n", timestamp,
 	    ep->name, (void *)nh, nua_event_name(event), phrase);