fixed remote client

git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@314 d4a5a174-5a4a-5b4b-b672-37683c10d7d5

diff --git a/RemoteClient/hayes.c b/RemoteClient/hayes.c
index 6e873f270b293ec1fc2a93156ffea25bc62f539c..5a4d4c20902e6844284df5a684526decad1236e6 100644 (file)
--- a/RemoteClient/hayes.c
+++ b/RemoteClient/hayes.c
@@ -150,7 +150,7 @@ int rcli_init(void) {
        _bios_serialcom(_COM_INIT, port, _COM_9600 | _COM_NOPARITY | _COM_CHR8 | _COM_STOP1);
        write_serial("AT&FE0F1\r");
        char* resp = modem_response();
-       bool echo = __dw_strcaseequ(resp, "AT&FE0F1") || __dw_strcaseequ(resp, "NO CARRIER");
+       bool echo = __dw_strcaseequ(resp, "AT&FE0F1");
        if(resp != NULL && echo) free(resp); /* Kill echo */
        if(resp == NULL) return 1;
        if(echo) resp = modem_response();
@@ -162,7 +162,13 @@ int rcli_init(void) {
                write_serial(dial);
                write_serial("\r");
                while(true) {
+                       free(resp);
                        resp = modem_response();
+                       if(__dw_strcaseequ(resp, "NO CARRIER")) {
+                               connected = false;
+                               free(resp);
+                               return 1;
+                       }
                        int i;
                        for(i = 0; resp[i] != 0; i++) {
                                if(resp[i] == ' ') {
@@ -173,6 +179,7 @@ int rcli_init(void) {
                        if(__dw_strcaseequ(resp, "CONNECT")) {
                                printf("Connected\n");
                                connected = true;
+                               free(resp);
                                break;
                        }
                }