Changeset 3360

Timestamp:

04/10/00 23:33:08 (13 years ago)

Author:

ucacoxh

Message:

Fixes for -f problem.

- Break late parsing into two - parse_addresses and

parse_options_late.

- Wait for rendez-vous to have completed before sending late options

otherwise settings_load will overwrite transmitted options.

Location:

rat/trunk

Files:

• MODS (modified) (2 diffs)
• main_control.c (modified) (5 diffs)

rat/trunk/MODS

@@ -1249 +1249 @@
           phone, location).
         - Fix -f codec communication from controller to engine.
+        - Break controller address and option parsing so options are not
+          communicated to engine before rendez-vous has occurred.  Otherwise
+          options can be lost due engine's settings_load occuring
+          after rendez-vous.
 
 TODO -- They're features not bugs dammit!
@@ -1304 +1308 @@
 - Rework media engine initialization, so we can query it before sending
   rtp.addr()
-- The -f command line option is broken (message arrives during rendez_vous).
-
+
+

rat/trunk/main_control.c

@@ -522 +522 @@
 }
 
-static int address_count(int argc, char *argv[])
+static int
+parse_options_late(struct mbus *m, char *addr, int argc, char *argv[])
 {
         const args_handler *a;
         int                 i;
-        
-        for (i = 0; i < argc; i++) {
-                a = get_late_args_handler(argv[i]);
-                if (a == NULL) {
-                        break;
-                }
-                i += a->argc;
-        }
-        return argc - i;
-}
-
-static void
-parse_non_addr(struct mbus *m, char *addr, int argc, char *argv[])
-{
-        const args_handler *a;
-        int                 i;
+
+        if (argc < 2) {
+                usage(NULL);
+                return FALSE;
+        }
+        argc -= 1; /* Skip process name */
+        argv += 1;
         
         for (i = 0; i < argc; i++) {
@@ -553 +545 @@
                 i += a->argc;
         }
-        return;
-}
+        return (i != argc);
+}
+
+static int 
+address_count(int argc, char *argv[])
+{
+        const args_handler *a;
+        int                 i;
+        
+        for (i = 0; i < argc; i++) {
+                a = get_late_args_handler(argv[i]);
+                if (a == NULL) {
+                        break;
+                }
+                i += a->argc;
+        }
+        return argc - i;
+}
+
 
 static int 
@@ -591 +600 @@
 }
 
-static int 
-parse_options(struct mbus *m, char *e_addr, char *u_addr, int argc, char *argv[])
+static int
+parse_addresses(struct mbus *m, char *e_addr, int argc, char *argv[])
 {
         char            *addr;
         int              i, naddr, rx_port, tx_port;
-        struct timeval   timeout;
-        
+         
         if (argc < 2) {
                 usage(NULL);
@@ -621 +629 @@
                 xfree(addr);
         }
-        parse_non_addr(m, e_addr, argc, argv);
-        
-        /* Synchronize with the sub-processes... */
-        do {
-                mbus_send(m);
-                mbus_heartbeat(m, 1);
-                mbus_retransmit(m);
-                timeout.tv_sec  = 0;
-                timeout.tv_usec = 20000;
-                mbus_recv(m, NULL, &timeout);
-        } while (!mbus_sent_all(m));
-        
-        UNUSED(u_addr);
         return TRUE;
 }
@@ -836 +831 @@
         u_addr = fork_process(m, UI_NAME,     c_addr, &pid_ui,     token_ui);
         e_addr = fork_process(m, ENGINE_NAME, c_addr, &pid_engine, token_engine);
-        
-        if (parse_options(m, e_addr, u_addr, argc, argv) == TRUE) {
+        if (parse_addresses(m, e_addr, argc, argv) == TRUE) {
                 mbus_rendezvous_go(m, token_engine, (void *) m);
                 mbus_rendezvous_go(m, token_ui,     (void *) m); 
-                
+                parse_options_late(m, e_addr, argc, argv);
                 final_iters = 25;
                 should_exit = FALSE;