fix: remove transport_is_here functions

eclipse-zenoh · Nov 15, 2023 · 3f93d16 · 3f93d16
1 parent 20640af
commit 3f93d16
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 14 deletions.
diff --git a/include/zenoh-pico/transport/multicast.h b/include/zenoh-pico/transport/multicast.h
@@ -17,8 +17,6 @@
 
 #include "zenoh-pico/api/types.h"
 
-bool _zp_is_multicast_here(void);
-
 void _zp_multicast_fetch_zid(const _z_transport_t *zt, z_owned_closure_zid_t *callback);
 void _zp_multicast_info_session(const _z_transport_t *zt, _z_config_t *ps);
 

diff --git a/include/zenoh-pico/transport/unicast.h b/include/zenoh-pico/transport/unicast.h
@@ -17,7 +17,6 @@
 
 #include "zenoh-pico/api/types.h"
 
-bool _zp_is_unicast_here(void);
 void _zp_unicast_fetch_zid(const _z_transport_t *zt, z_owned_closure_zid_t *callback);
 void _zp_unicast_info_session(const _z_transport_t *zt, _z_config_t *ps);
 

diff --git a/src/session/scout.c b/src/session/scout.c
@@ -141,9 +141,8 @@ _z_hello_list_t *_z_scout_inner(const z_what_t what, _z_id_t zid, const char *lo
     _z_scouting_message_encode(&wbf, &scout);
 
     // Scout on multicast
-    if (_zp_is_multicast_here()) {
-        ret = __z_scout_loop(&wbf, locator, timeout, exit_on_first);
-    }
+    ret = __z_scout_loop(&wbf, locator, timeout, exit_on_first);
+
     _z_wbuf_clear(&wbf);
 
     return ret;

diff --git a/src/transport/multicast.c b/src/transport/multicast.c
@@ -30,8 +30,6 @@
 #include "zenoh-pico/utils/logging.h"
 
 #if Z_FEATURE_MULTICAST_TRANSPORT == 1
-bool _zp_is_multicast_here(void) { return true; }
-
 void _zp_multicast_fetch_zid(const _z_transport_t *zt, z_owned_closure_zid_t *callback) {
     void *ctx = callback->context;
     _z_transport_peer_entry_list_t *l = zt->_transport._multicast._peers;
@@ -55,8 +53,6 @@ void _zp_multicast_info_session(const _z_transport_t *zt, _z_config_t *ps) {
 }
 
 #else
-bool _zp_is_multicast_here(void) { return false; }
-
 void _zp_multicast_fetch_zid(const _z_transport_t *zt, z_owned_closure_zid_t *callback) {
     _ZP_UNUSED(zt);
     _ZP_UNUSED(callback);

diff --git a/src/transport/unicast.c b/src/transport/unicast.c
@@ -31,8 +31,6 @@
 #include "zenoh-pico/utils/logging.h"
 
 #if Z_FEATURE_UNICAST_TRANSPORT == 1
-bool _zp_is_unicast_here(void) { return true; }
-
 void _zp_unicast_fetch_zid(const _z_transport_t *zt, z_owned_closure_zid_t *callback) {
     void *ctx = callback->context;
     z_id_t id = zt->_transport._unicast._remote_zid;
@@ -46,8 +44,6 @@ void _zp_unicast_info_session(const _z_transport_t *zt, _z_config_t *ps) {
 }
 
 #else
-bool _zp_is_unicast_here(void) { return false; }
-
 void _zp_unicast_fetch_zid(const _z_transport_t *zt, z_owned_closure_zid_t *callback) {
     _ZP_UNUSED(zt);
     _ZP_UNUSED(callback);