manually merged r49922 and r50335, because of conflicts. this commint includes addition of the ISDN RESTART Message

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@51648 f38db490-d61c-443f-a65b-d21fe96a405b

3 files changed, 43 insertions, 0 deletions

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 28cf4e9cb..2510df437 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -792,6 +792,20 @@ static int misdn_restart_pid (int fd, int argc, char *argv[])
 	return 0;
 }
 
+static int misdn_send_restart(int fd, int argc, char *argv[])
+{
+	int port;
+	
+	if (argc != 4)
+		return RESULT_SHOWUSAGE;
+ 
+	port = atoi(argv[3]);
+ 
+ 	misdn_lib_send_restart(port);
+	
+	return 0;
+}
+
 static int misdn_port_up (int fd, int argc, char *argv[])
 {
 	int port;
@@ -1426,6 +1440,9 @@ static struct ast_cli_entry chan_misdn_clis[] = {
 		"Usage: misdn restart port\n" },
 	{ {"misdn","restart","pid", NULL}, misdn_restart_pid, "Restarts the given pid",
 		"Usage: misdn restart pid\n" },
+	{ {"misdn","send","restart", NULL},  misdn_send_restart, 
+	  "Sends a restart for every bchannel on the given port", 
+	  "Usage: misdn send restart <port>\n"},
 	{ {"misdn","port","up", NULL}, misdn_port_up, "Tries to establish L1 on the given port",
 		"Usage: misdn port up <port>\n" },
 	{ {"misdn","port","down", NULL}, misdn_port_down, "Tries to deacivate the L1 on the given port",
diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c
index 69fa12a0c..d655b9305 100644
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -3603,6 +3603,31 @@ int misdn_lib_pid_restart(int pid)
 	return 0;
 }
 
+/*Sends Restart message for every bchnanel*/
+int misdn_lib_send_restart(int port)
+{
+	struct misdn_stack *stack=find_stack_by_port(port);
+	cb_log(0, port, "Sending Restarts on this port.\n");
+	
+	struct misdn_bchannel dummybc;
+	memset (&dummybc,0,sizeof(dummybc));
+	dummybc.port=stack->port;
+	dummybc.l3_id=MISDN_ID_DUMMY;
+	dummybc.nt=stack->nt;
+
+	int max=stack->pri?30:2;
+	int i;
+	for (i=1;i<max;i++) {
+		dummybc.channel=i;
+		cb_log(0, port, "Restarting channel %d\n",i);
+		misdn_lib_send_event(&dummybc, EVENT_RESTART);
+		/*do we need to wait before we get an EVENT_RESTART_ACK ?*/
+	}
+
+	return 0;
+}
+
+/*reinitializes the L2/L3*/
 int misdn_lib_port_restart(int port)
 {
 	struct misdn_stack *stack=find_stack_by_port(port);
diff --git a/channels/misdn/isdn_lib.h b/channels/misdn/isdn_lib.h
index ccd87bcfb..e320882dd 100644
--- a/channels/misdn/isdn_lib.h
+++ b/channels/misdn/isdn_lib.h
@@ -409,6 +409,7 @@ void isdn_lib_stop_dtmf (struct misdn_bchannel *bc);
 
 int misdn_lib_port_restart(int port);
 int misdn_lib_pid_restart(int pid);
+int misdn_lib_send_restart(int port);
 
 int misdn_lib_get_port_info(int port);