Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.97
diff -u -r1.97 asterisk.c
--- asterisk.c	25 Jun 2004 04:07:52 -0000	1.97
+++ asterisk.c	25 Jun 2004 19:15:46 -0000
@@ -58,6 +58,10 @@
 #define AST_MAX_CONNECTS 128
 #define NUM_MSGS 64
 
+#define WELCOME_MESSAGE ast_verbose( "Asterisk " ASTERISK_VERSION ", Copyright (C) 1999-2004 Digium.\n"); \
+		ast_verbose( "Written by Mark Spencer <markster@digium.com>\n"); \
+		ast_verbose( "=========================================================================\n")
+
 int option_verbose=0;
 int option_debug=0;
 int option_nofork=0;
@@ -70,6 +74,7 @@
 int option_nocolor;
 int option_dumpcore = 0;
 int option_overrideconfig = 0;
+int option_reconnect = 0;
 int fully_booted = 0;
 
 static int ast_socket = -1;		/* UNIX Socket for allowing remote control */
@@ -871,7 +876,27 @@
 			/* if the remote side disappears exit */
 			if (res < 1) {
 				fprintf(stderr, "\nDisconnected from Asterisk server\n");
-				quit_handler(0, 0, 0, 0);
+				if (!option_reconnect) {
+					quit_handler(0, 0, 0, 0);
+				} else {
+					int tries;
+					int reconnects_per_second = 20;
+					fprintf(stderr, "Attempting to reconnect for 30 seconds\n");
+					for (tries=0;tries<30 * reconnects_per_second;tries++) {
+						if (ast_tryconnect()) {
+							fprintf(stderr, "Reconnect succeeded after %.3f seconds\n", 1.0 / reconnects_per_second * tries);
+							printf(term_quit());
+							WELCOME_MESSAGE;
+							break;
+						} else {
+							usleep(1000000 / reconnects_per_second);
+						}
+					}
+					if (tries >= 30) {
+						fprintf(stderr, "Failed to reconnect for 30 seconds.  Quitting.\n");
+						quit_handler(0, 0, 0, 0);
+					}
+				}
 			}
 
 			buf[res] = '\0';
@@ -1394,6 +1419,7 @@
 	printf("   -p              Run as pseudo-realtime thread\n");
 	printf("   -q              Quiet mode (supress output)\n");
 	printf("   -r              Connect to Asterisk on this machine\n");
+	printf("   -R              Connect to Asterisk, and attempt to reconnect if disconnected\n");
 	printf("   -v              Increase verbosity (multiple v's = more verbose)\n");
 	printf("   -x <cmd>        Execute command <cmd> (only valid with -r)\n");
 	printf("\n");
@@ -1498,7 +1524,7 @@
 	}
 	*/
 	/* Check for options */
-	while((c=getopt(argc, argv, "hfdvqprgcinx:C:")) != -1) {
+	while((c=getopt(argc, argv, "hfdvqprRgcinx:C:")) != -1) {
 		switch(c) {
 		case 'd':
 			option_debug++;
@@ -1518,6 +1544,11 @@
 			option_remote++;
 			option_nofork++;
 			break;
+		case 'R':
+			option_remote++;
+			option_nofork++;
+			option_reconnect++;
+			break;
 		case 'p':
 			option_highpriority++;
 			break;
@@ -1597,9 +1628,7 @@
 			}
 			printf(term_quit());
 			ast_register_verbose(console_verboser);
-			ast_verbose( "Asterisk " ASTERISK_VERSION ", Copyright (C) 1999-2004 Digium.\n");
-			ast_verbose( "Written by Mark Spencer <markster@digium.com>\n");
-			ast_verbose( "=========================================================================\n");
+			WELCOME_MESSAGE;
 			ast_remotecontrol(NULL);
 			quit_handler(0, 0, 0, 0);
 			exit(0);
@@ -1646,9 +1675,7 @@
 		ast_register_verbose(console_verboser);
 	/* Print a welcome message if desired */
 	if (option_verbose || option_console) {
-		ast_verbose( "Asterisk " ASTERISK_VERSION ", Copyright (C) 1999-2004 Digium.\n");
-		ast_verbose( "Written by Mark Spencer <markster@digium.com>\n");
-		ast_verbose( "=========================================================================\n");
+		WELCOME_MESSAGE;
 	}
 	if (option_console && !option_verbose) 
 		ast_verbose("[ Booting...");