Found/fixed 2 bugs: One was null pointer after o2_service_free, and one was not finding/freeing the port in o2_osc_port_free. Extended oscsendtest and oscrecvtest to test the o2_osc_port_free fix.

Author: rbdannenberg

src/o2.c

@@ -644,7 +644,7 @@ int o2_service_provider_new(o2string service_name, o2_info_ptr service,
             O2_DBd(printf("%s o2_service_provider_new service exists %s\n",
                           o2_debug_prefix, service_name));
             // however, the tappee might be new or different
-            if (*tappee) {
+            if (tappee) {
                 return o2_set_tap(tappee, service_name);
             }
             return O2_SERVICE_EXISTS;

src/o2.h

@@ -819,7 +819,7 @@ int o2_tap(const char *tappee, const char *tapper);
  * 
  * @return #O2_SUCCSS if success, #O2_FAIL if not.
  */
-int o2_service_free(char *service_name);
+int o2_service_free(const char *service_name);
 
 
 /**

src/o2_interoperation.c

@@ -105,7 +105,7 @@ int o2_osc_port_free(int port_num)
                 info->osc.service_name = NULL;
             }
             o2_socket_mark_to_free(info);
-            result = O2_SUCCESS; // actual found and removed a port
+            result = O2_SUCCESS; // actually found and removed a port
         }
     }
     if (service_name_copy) O2_FREE((void *)service_name_copy);

src/o2_search.c

@@ -839,8 +839,11 @@ int o2_set_tap(const char *tappee, const char *tapper_name)
 
 // remove a service from o2_context->path_tree
 //
-int o2_service_free(char *service_name)
+int o2_service_free(const char *service_name)
 {
+    if (!o2_application_name) {
+        return O2_NOT_INITIALIZED;
+    }
     if (!service_name || strchr(service_name, '/'))
         return O2_BAD_SERVICE_NAME;
     return o2_service_provider_replace(o2_context->process, service_name, NULL);

src/o2_socket.c

@@ -439,6 +439,7 @@ int o2_make_udp_recv_socket(int tag, int *port, process_info_ptr *info)
     O2_DBo(printf("%s created socket %ld and bind called to receive UDP\n",
                   o2_debug_prefix, (long) sock));
     *info = o2_add_new_socket(sock, tag, &udp_recv_handler);
+    (*info)->port = *port;
     // printf("%s: o2_make_udp_recv_socket: listening on port %d\n", o2_debug_prefix, o2_context->process.port);
     return O2_SUCCESS;
 }

test/oscrecvtest.c

@@ -1,6 +1,7 @@
 //  oscrecvtest.c - test o2_osc_port_new()
 //
 //  this test is designed to run with oscsendtest.c
+//  see oscsendtest.c for details
 
 
 #include "stdio.h"
@@ -43,6 +44,12 @@ void osc_i_handler(o2_msg_data_ptr data, const char *types,
 #endif
         assert(approx(timed_start + i * 0.1 - now));
         timed_count++;
+    } else if (i == 5678) {
+        printf("osc_i_handler received 5678 but port should be closed.\n");
+        assert(FALSE);
+    } else if (i == 6789) {
+        printf("osc_i_handler received 6789 but port should be closed.\n");
+        assert(FALSE);
     } else {
         assert(FALSE); // unexpected message
     }
@@ -76,6 +83,13 @@ int main(int argc, const char * argv[])
         usleep(2000); // 2ms
     }
     o2_osc_port_free(8100);
+
+    // now wait for 2 seconds and check for more messages
+    for (int i = 0; i < 1000; i++) {
+        o2_poll();
+        usleep(2000); // 2ms
+    }
+        
     o2_finish();
     printf("OSCRECV DONE\n");
     sleep(1); // allow TCP to finish up

test/oscsendtest.c

@@ -1,6 +1,26 @@
-//  oscsendtest.c - test o2_osc_delegate()
+// oscsendtest.c - test o2_osc_delegate()
 //
-//  this test is designed to run with oscrecvtest.c
+// this test is designed to run with oscrecvtest.c
+//
+// Usage: oscsendtest [flags] (see o2.h for flags, 
+//             use a for all, also u for UDP, M for master)
+//
+// The test:
+//   initialize as a clock slave or master depending on M flag
+//   if we are master, assume we are talking to a liblo server,
+//         so sleep 2 seconds allowing liblo server to launch
+//         (you should launch it first if running manually)
+//   send 12 messages, 1 every 0.5s, and stop,
+//         message are /oscsend/i 1234
+//   send 10 messages with timestamps,
+//         messages are /oscsend/i <2000+i>
+//   reciever can now call o2_osc_port_free to test closing the port
+//   wait 1 second
+//   send 1 message: /oscsend/i 5678
+//   wait 0.1 seconds
+//   send 1 message with timestamp: /oscsend/i 6789
+//   wait 1 second
+//   shut everything down
 
 #include "o2.h"
 #include "stdio.h"
@@ -33,7 +53,7 @@ int main(int argc, const char * argv[])
 
     o2_initialize("test");
 
-    // you can make this run without an O2 server by passing "master"
+    // you can make this run without an O2 server by passing "M" flag
     if (master)
         o2_clock_set(NULL, NULL);
     else if (argc > 2)
@@ -70,6 +90,25 @@ int main(int argc, const char * argv[])
         o2_poll();
         usleep(2000); // 2ms
     }
+    // receiver may want to close port now and check that these
+    printf("Time to close receiver's port if you want to test that.\n");
+    // messages are NOT received:
+    err = o2_send("/oscsend/i", 0, "i", 5678);
+    assert(err == O2_SUCCESS);
+    printf("sent 5678 to /oscsend/i\n");
+    // pause for 0.1s, but keep running O2 by polling
+    for (int i = 0; i < 50; i++) {
+        o2_poll();
+        usleep(2000); // 2ms
+    }
+    double ts = o2_time_get() + 0.1;
+    o2_send("/oscsend/i", ts, "i", 6789);
+    printf("sent 6789 to /oscsend/i with timestamp %g\n", ts);
+    // pause for 1s, but keep running O2 by polling
+    for (int i = 0; i < 500; i++) {
+        o2_poll();
+        usleep(2000); // 2ms
+    }
     o2_service_free("oscsend");
     o2_finish();
     sleep(1); // finish closing sockets