Clean up modem dialing.

Add more init string help.

src/syncterm/bbslist.c

@@ -662,7 +662,18 @@ void change_settings(void)
 				break;
 			case 4:
 				uifc.helpbuf=	"`Modem Init String`\n\n"
-								"Your modem init string goes here.";
+								"Your modem init string goes here.\n";
+								"For reference, here are the expected settings and USR inits\n\n"
+								"State                      USR Init"
+								"------------------------------------"
+								"Echo on                    E1"
+								"Verbal result codes        Q0V1"
+								"Include connection speed   &X4"
+								"Normal CD Handling         C1"
+								"Locked speed               &B1"
+								"Normal DTR                 &D2"
+								"CTS/RTS Flow Control       &H1&R2"
+								"Disable Software Flow      &I0";
 				uifc.input(WIN_MID|WIN_SAV,0,0,"Modem Init String",settings.mdm.init_string,LIST_NAME_MAX,K_EDIT);
 				iniSetString(&inicontents,"SyncTERM","ModemInit",settings.mdm.init_string,&ini_style);
 				break;

src/syncterm/modem.c

@@ -136,6 +136,7 @@ int modem_connect(struct bbslist *bbs)
 	comWriteString(com, "\r");
 
 	/* Wait for "OK" */
+	while(1) {
 		if(modem_response(respbuf, sizeof(respbuf), 5)) {
 			modem_close();
 			uifc.pop(NULL);
@@ -145,20 +146,10 @@ int modem_connect(struct bbslist *bbs)
 			conn_api.terminate=-1;
 			return(-1);
 		}
-uifc.pop(NULL);
-uifc.pop(respbuf);
-	if(strstr(respbuf, settings.mdm.init_string))
-	if(modem_response(respbuf, sizeof(respbuf), 5)) {
-		modem_close();
-		uifc.pop(NULL);
-		uifcmsg("Modem Not Responding",	"`Modem Not Responding`\n\n"
-						"The modem did not respond to the initializtion string\n"
-						"Check your init string and phone number.\n");
-		conn_api.terminate=-1;
-		return(-1);
+		if(strstr(respbuf, settings.mdm.init_string))	/* Echo is on */
+			continue;
+		break;
 	}
-uifc.pop(NULL);
-uifc.pop(respbuf);
 
 	if(!strstr(respbuf, "OK")) {
 		modem_close();
@@ -176,6 +167,7 @@ uifc.pop(respbuf);
 	comWriteString(com, "\r");
 
 	/* Wait for "CONNECT" */
+	while(1) {
 		if(modem_response(respbuf, sizeof(respbuf), 30)) {
 			modem_close();
 			uifc.pop(NULL);
@@ -184,18 +176,11 @@ uifc.pop(respbuf);
 			conn_api.terminate=-1;
 			return(-1);
 		}
-uifc.pop(NULL);
-uifc.pop(respbuf);
-	if(modem_response(respbuf, sizeof(respbuf), 30)) {
-		modem_close();
-		uifc.pop(NULL);
-		uifcmsg("No Answer",	"`No Answer`\n\n"
-						"The modem did not connect withing 30 seconds.\n");
-		conn_api.terminate=-1;
-		return(-1);
+		if(strstr(respbuf, "ATA"))	/* Dial command echoed */
+			continue;
+		break;
 	}
-uifc.pop(NULL);
-uifc.pop(respbuf);
+
 	if(!strstr(respbuf, "CONNECT")) {
 		modem_close();
 		uifc.pop(NULL);