Changeset 925 in ntrip for trunk/ntripserver/ntripserver.c

Timestamp:

May 21, 2008, 10:01:20 AM (16 years ago)

Author:

stuerze

Message:

added fallback possibility without re-connect

File:

• trunk/ntripserver/ntripserver.c (modified) (7 diffs)

trunk/ntripserver/ntripserver.c

@@ -1 +1 @@
 /*
- * $Id: ntripserver.c,v 1.41 2008/05/16 07:33:31 stoecker Exp $
+ * $Id: ntripserver.c,v 1.42 2008/05/16 07:55:15 stoecker Exp $
  *
  * Copyright (c) 2003...2007
@@ -37 +37 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.41 $";
-static char datestr[]     = "$Date: 2008/05/16 07:33:31 $";
+static char revisionstr[] = "$Revision: 1.42 $";
+static char datestr[]     = "$Date: 2008/05/16 07:55:15 $";
 
 #include <ctype.h>
@@ -835 +835 @@
     
     /* ----- main part ----- */
-    int output_init = 1;
+    int output_init = 1, fallback = 0;
 
     while((input_init) && (output_init))
@@ -881 +881 @@
       {
         case NTRIP1: /*** OutputMode Ntrip Version 1.0 ***/
+          fallback = 0;
           nBufferBytes = snprintf(szSendBuffer, sizeof(szSendBuffer),
             "SOURCE %s %s/%s\r\n"
@@ -1077 +1078 @@
                   close_session(casterouthost, mountpoint, session, rtsp_extension, 1);
                   outputmode = HTTP;
+                  fallback = 1;
                   break;
                 }
@@ -1092 +1094 @@
                   close_session(casterouthost, mountpoint, session, rtsp_extension, 1);
                   outputmode = NTRIP1;
+                  fallback = 1;
                   break;
                 }
@@ -1171 +1174 @@
     }
     close_session(casterouthost, mountpoint, session, rtsp_extension, 0);
-    if((reconnect_sec_max)  && (!sigint_received))
+    if( (reconnect_sec_max || fallback) && !sigint_received )
       reconnect_sec = reconnect(reconnect_sec, reconnect_sec_max);
     else inputmode = LAST;