[Asterisk-cvs] libpri-matt pritest.c,1.6,1.7 q931.c,1.20,1.21

[mattf at lists.digium.com]

Update of /usr/cvsroot/libpri-matt
In directory mongoose.digium.com:/tmp/cvs-serv1959

Modified Files:
	pritest.c q931.c 
Log Message:
More changes, debugging, comparing hex dumps


Index: pritest.c
===================================================================
RCS file: /usr/cvsroot/libpri-matt/pritest.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pritest.c	13 Jan 2005 02:26:02 -0000	1.6
+++ pritest.c	3 Feb 2005 02:04:28 -0000	1.7
@@ -56,6 +56,7 @@
 
 
 static int offset = 0;
+static int mwiactivate = -1;
 
 static void do_channel(ZAP *z)
 {
@@ -254,15 +255,34 @@
 	switch(e->e) {
 	case PRI_EVENT_DCHAN_UP:
 		printf("-- D-Channel is now up!  :-)\n");
-		call = pri_new_call(pri);
-		if (!call) {
-			perror("pri_new_call");
-		} else if (pri_mwi_activate(pri, call, "1111", PRI_UNKNOWN,
+		switch (mwiactivate) {
+			case 1:
+				call = pri_new_call(pri);
+				if (!call) {
+					perror("pri_new_call");
+					break;
+				} 
+				pri_mwi_activate(pri, call, "1111", PRI_UNKNOWN,
 					"Joe Schmoe",
 					PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN,
 					"5737", /* Don's number */
-					PRI_UNKNOWN))
-			perror("pri_mwi_send");
+					PRI_UNKNOWN);
+				break;
+			case 2:
+				call = pri_new_call(pri);
+				if (!call) {
+					perror("pri_new_call");
+					break;
+				} 
+				pri_mwi_deactivate(pri, call, "1111", PRI_UNKNOWN,
+					"Joe Schmoe",
+					PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN,
+					"5737", /* Don's number */
+					PRI_UNKNOWN);
+				break;
+			default:
+				break;
+		}
 		break;
 	case PRI_EVENT_DCHAN_DOWN:
 		printf("-- D-Channel is now down! :-(\n");
@@ -414,6 +434,19 @@
 		}
 	}
 
+	if (argc > 4) {
+		switch (*argv[4]) {
+		case '1':
+			mwiactivate = 1;
+			break;
+		case '0':
+			mwiactivate = 0;
+			break;
+		default:
+			break;
+		}
+	}
+
 	signal(SIGCHLD, chan_ended);
 
 	if (run_pri(dfd, swtype, node))

Index: q931.c
===================================================================
RCS file: /usr/cvsroot/libpri-matt/q931.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- q931.c	21 Jan 2005 18:59:23 -0000	1.20
+++ q931.c	3 Feb 2005 02:04:28 -0000	1.21
@@ -2471,7 +2471,7 @@
 
 static int gr303_setup_ies[] =  { Q931_BEARER_CAPABILITY, Q931_CHANNEL_IDENT, -1 };
 
-static int cis_setup_ies[] = { Q931_BEARER_CAPABILITY, Q931_CHANNEL_IDENT, Q931_CALLED_PARTY_NUMBER, Q931_IE_FACILITY, -1 };
+static int cis_setup_ies[] = { Q931_BEARER_CAPABILITY, Q931_CHANNEL_IDENT, Q931_IE_FACILITY, Q931_CALLED_PARTY_NUMBER, -1 };
 
 int q931_setup(struct pri *pri, q931_call *c, struct pri_sr *req)
 {