Skip to content

Commit 5439a45

Browse files
MalletsMallets
committed
Fix #245 
1 parent 44c2dc5 commit 5439a45

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+120
-120
lines changed

‎examples/arduino/z_get.ino

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
#define CLIENT_OR_PEER 0 // 0: Client mode; 1: Peer mode
2424
#if CLIENT_OR_PEER == 0
2525
#define MODE "client"
26-
#define PEER "" // If empty, it will scout
26+
#define CONNECT "" // If empty, it will scout
2727
#elif CLIENT_OR_PEER == 1
2828
#define MODE "peer"
29-
#define PEER "udp/224.0.0.225:7447#iface=en0"
29+
#define CONNECT "udp/224.0.0.225:7447#iface=en0"
3030
#else
3131
#error "Unknown Zenoh operation mode. Check CLIENT_OR_PEER value."
3232
#endif
@@ -79,8 +79,8 @@ void setup() {
7979
// Initialize Zenoh Session and other parameters
8080
z_owned_config_t config = z_config_default();
8181
zp_config_insert(z_config_loan(&config), Z_CONFIG_MODE_KEY, z_string_make(MODE));
82-
if (strcmp(PEER, "") != 0) {
83-
zp_config_insert(z_config_loan(&config), Z_CONFIG_PEER_KEY, z_string_make(PEER));
82+
if (strcmp(CONNECT, "") != 0) {
83+
zp_config_insert(z_config_loan(&config), Z_CONFIG_CONNECT_KEY, z_string_make(CONNECT));
8484
}
8585

8686
// Open Zenoh session

‎examples/arduino/z_pub.ino

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
#define CLIENT_OR_PEER 0 // 0: Client mode; 1: Peer mode
2424
#if CLIENT_OR_PEER == 0
2525
#define MODE "client"
26-
#define PEER "" // If empty, it will scout
26+
#define CONNECT "" // If empty, it will scout
2727
#elif CLIENT_OR_PEER == 1
2828
#define MODE "peer"
29-
#define PEER "udp/224.0.0.225:7447#iface=en0"
29+
#define CONNECT "udp/224.0.0.225:7447#iface=en0"
3030
#else
3131
#error "Unknown Zenoh operation mode. Check CLIENT_OR_PEER value."
3232
#endif
@@ -56,8 +56,8 @@ void setup() {
5656
// Initialize Zenoh Session and other parameters
5757
z_owned_config_t config = z_config_default();
5858
zp_config_insert(z_config_loan(&config), Z_CONFIG_MODE_KEY, z_string_make(MODE));
59-
if (strcmp(PEER, "") != 0) {
60-
zp_config_insert(z_config_loan(&config), Z_CONFIG_PEER_KEY, z_string_make(PEER));
59+
if (strcmp(CONNECT, "") != 0) {
60+
zp_config_insert(z_config_loan(&config), Z_CONFIG_CONNECT_KEY, z_string_make(CONNECT));
6161
}
6262

6363
// Open Zenoh session

‎examples/arduino/z_pull.ino

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
#define CLIENT_OR_PEER 0 // 0: Client mode; 1: Peer mode
2424
#if CLIENT_OR_PEER == 0
2525
#define MODE "client"
26-
#define PEER "" // If empty, it will scout
26+
#define CONNECT "" // If empty, it will scout
2727
#elif CLIENT_OR_PEER == 1
2828
#define MODE "peer"
29-
#define PEER "udp/224.0.0.225:7447#iface=en0"
29+
#define CONNECT "udp/224.0.0.225:7447#iface=en0"
3030
#else
3131
#error "Unknown Zenoh operation mode. Check CLIENT_OR_PEER value."
3232
#endif
@@ -67,8 +67,8 @@ void setup() {
6767
// Initialize Zenoh Session and other parameters
6868
z_owned_config_t config = z_config_default();
6969
zp_config_insert(z_config_loan(&config), Z_CONFIG_MODE_KEY, z_string_make(MODE));
70-
if (strcmp(PEER, "") != 0) {
71-
zp_config_insert(z_config_loan(&config), Z_CONFIG_PEER_KEY, z_string_make(PEER));
70+
if (strcmp(CONNECT, "") != 0) {
71+
zp_config_insert(z_config_loan(&config), Z_CONFIG_CONNECT_KEY, z_string_make(CONNECT));
7272
}
7373

7474
// Open Zenoh session

‎examples/arduino/z_queryable.ino

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
#define CLIENT_OR_PEER 0 // 0: Client mode; 1: Peer mode
2424
#if CLIENT_OR_PEER == 0
2525
#define MODE "client"
26-
#define PEER "" // If empty, it will scout
26+
#define CONNECT "" // If empty, it will scout
2727
#elif CLIENT_OR_PEER == 1
2828
#define MODE "peer"
29-
#define PEER "udp/224.0.0.225:7447#iface=en0"
29+
#define CONNECT "udp/224.0.0.225:7447#iface=en0"
3030
#else
3131
#error "Unknown Zenoh operation mode. Check CLIENT_OR_PEER value."
3232
#endif
@@ -67,8 +67,8 @@ void setup() {
6767
// Initialize Zenoh Session and other parameters
6868
z_owned_config_t config = z_config_default();
6969
zp_config_insert(z_config_loan(&config), Z_CONFIG_MODE_KEY, z_string_make(MODE));
70-
if (strcmp(PEER, "") != 0) {
71-
zp_config_insert(z_config_loan(&config), Z_CONFIG_PEER_KEY, z_string_make(PEER));
70+
if (strcmp(CONNECT, "") != 0) {
71+
zp_config_insert(z_config_loan(&config), Z_CONFIG_CONNECT_KEY, z_string_make(CONNECT));
7272
}
7373

7474
// Open Zenoh session

‎examples/arduino/z_sub.ino

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
#define CLIENT_OR_PEER 0 // 0: Client mode; 1: Peer mode
2424
#if CLIENT_OR_PEER == 0
2525
#define MODE "client"
26-
#define PEER "" // If empty, it will scout
26+
#define CONNECT "" // If empty, it will scout
2727
#elif CLIENT_OR_PEER == 1
2828
#define MODE "peer"
29-
#define PEER "udp/224.0.0.225:7447#iface=en0"
29+
#define CONNECT "udp/224.0.0.225:7447#iface=en0"
3030
#else
3131
#error "Unknown Zenoh operation mode. Check CLIENT_OR_PEER value."
3232
#endif
@@ -65,8 +65,8 @@ void setup() {
6565
// Initialize Zenoh Session and other parameters
6666
z_owned_config_t config = z_config_default();
6767
zp_config_insert(z_config_loan(&config), Z_CONFIG_MODE_KEY, z_string_make(MODE));
68-
if (strcmp(PEER, "") != 0) {
69-
zp_config_insert(z_config_loan(&config), Z_CONFIG_PEER_KEY, z_string_make(PEER));
68+
if (strcmp(CONNECT, "") != 0) {
69+
zp_config_insert(z_config_loan(&config), Z_CONFIG_CONNECT_KEY, z_string_make(CONNECT));
7070
}
7171

7272
// Open Zenoh session

‎examples/espidf/z_get.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ static int s_retry_count = 0;
3737
#define CLIENT_OR_PEER 0 // 0: Client mode; 1: Peer mode
3838
#if CLIENT_OR_PEER == 0
3939
#define MODE "client"
40-
#define PEER "" // If empty, it will scout
40+
#define CONNECT "" // If empty, it will scout
4141
#elif CLIENT_OR_PEER == 1
4242
#define MODE "peer"
43-
#define PEER "udp/224.0.0.225:7447#iface=en0"
43+
#define CONNECT "udp/224.0.0.225:7447#iface=en0"
4444
#else
4545
#error "Unknown Zenoh operation mode. Check CLIENT_OR_PEER value."
4646
#endif
@@ -133,8 +133,8 @@ void app_main() {
133133
// Initialize Zenoh Session and other parameters
134134
z_owned_config_t config = z_config_default();
135135
zp_config_insert(z_loan(config), Z_CONFIG_MODE_KEY, z_string_make(MODE));
136-
if (strcmp(PEER, "") != 0) {
137-
zp_config_insert(z_loan(config), Z_CONFIG_PEER_KEY, z_string_make(PEER));
136+
if (strcmp(CONNECT, "") != 0) {
137+
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(CONNECT));
138138
}
139139

140140
// Open Zenoh session

‎examples/espidf/z_pub.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ static int s_retry_count = 0;
3737
#define CLIENT_OR_PEER 0 // 0: Client mode; 1: Peer mode
3838
#if CLIENT_OR_PEER == 0
3939
#define MODE "client"
40-
#define PEER "" // If empty, it will scout
40+
#define CONNECT "" // If empty, it will scout
4141
#elif CLIENT_OR_PEER == 1
4242
#define MODE "peer"
43-
#define PEER "udp/224.0.0.225:7447#iface=en0"
43+
#define CONNECT "udp/224.0.0.225:7447#iface=en0"
4444
#else
4545
#error "Unknown Zenoh operation mode. Check CLIENT_OR_PEER value."
4646
#endif
@@ -120,8 +120,8 @@ void app_main() {
120120
// Initialize Zenoh Session and other parameters
121121
z_owned_config_t config = z_config_default();
122122
zp_config_insert(z_loan(config), Z_CONFIG_MODE_KEY, z_string_make(MODE));
123-
if (strcmp(PEER, "") != 0) {
124-
zp_config_insert(z_loan(config), Z_CONFIG_PEER_KEY, z_string_make(PEER));
123+
if (strcmp(CONNECT, "") != 0) {
124+
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(CONNECT));
125125
}
126126

127127
// Open Zenoh session

‎examples/espidf/z_pull.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ static int s_retry_count = 0;
3737
#define CLIENT_OR_PEER 0 // 0: Client mode; 1: Peer mode
3838
#if CLIENT_OR_PEER == 0
3939
#define MODE "client"
40-
#define PEER "" // If empty, it will scout
40+
#define CONNECT "" // If empty, it will scout
4141
#elif CLIENT_OR_PEER == 1
4242
#define MODE "peer"
43-
#define PEER "udp/224.0.0.225:7447#iface=en0"
43+
#define CONNECT "udp/224.0.0.225:7447#iface=en0"
4444
#else
4545
#error "Unknown Zenoh operation mode. Check CLIENT_OR_PEER value."
4646
#endif
@@ -126,8 +126,8 @@ void app_main() {
126126
// Initialize Zenoh Session and other parameters
127127
z_owned_config_t config = z_config_default();
128128
zp_config_insert(z_loan(config), Z_CONFIG_MODE_KEY, z_string_make(MODE));
129-
if (strcmp(PEER, "") != 0) {
130-
zp_config_insert(z_loan(config), Z_CONFIG_PEER_KEY, z_string_make(PEER));
129+
if (strcmp(CONNECT, "") != 0) {
130+
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(CONNECT));
131131
}
132132

133133
// Open Zenoh session

‎examples/espidf/z_queryable.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ static int s_retry_count = 0;
3737
#define CLIENT_OR_PEER 0 // 0: Client mode; 1: Peer mode
3838
#if CLIENT_OR_PEER == 0
3939
#define MODE "client"
40-
#define PEER "" // If empty, it will scout
40+
#define CONNECT "" // If empty, it will scout
4141
#elif CLIENT_OR_PEER == 1
4242
#define MODE "peer"
43-
#define PEER "udp/224.0.0.225:7447#iface=en0"
43+
#define CONNECT "udp/224.0.0.225:7447#iface=en0"
4444
#else
4545
#error "Unknown Zenoh operation mode. Check CLIENT_OR_PEER value."
4646
#endif
@@ -129,8 +129,8 @@ void app_main() {
129129
// Initialize Zenoh Session and other parameters
130130
z_owned_config_t config = z_config_default();
131131
zp_config_insert(z_loan(config), Z_CONFIG_MODE_KEY, z_string_make(MODE));
132-
if (strcmp(PEER, "") != 0) {
133-
zp_config_insert(z_loan(config), Z_CONFIG_PEER_KEY, z_string_make(PEER));
132+
if (strcmp(CONNECT, "") != 0) {
133+
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(CONNECT));
134134
}
135135

136136
// Open Zenoh session

‎examples/espidf/z_sub.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ static int s_retry_count = 0;
3737
#define CLIENT_OR_PEER 0 // 0: Client mode; 1: Peer mode
3838
#if CLIENT_OR_PEER == 0
3939
#define MODE "client"
40-
#define PEER "" // If empty, it will scout
40+
#define CONNECT "" // If empty, it will scout
4141
#elif CLIENT_OR_PEER == 1
4242
#define MODE "peer"
43-
#define PEER "udp/224.0.0.225:7447#iface=en0"
43+
#define CONNECT "udp/224.0.0.225:7447#iface=en0"
4444
#else
4545
#error "Unknown Zenoh operation mode. Check CLIENT_OR_PEER value."
4646
#endif
@@ -126,8 +126,8 @@ void app_main() {
126126
// Initialize Zenoh Session and other parameters
127127
z_owned_config_t config = z_config_default();
128128
zp_config_insert(z_loan(config), Z_CONFIG_MODE_KEY, z_string_make(MODE));
129-
if (strcmp(PEER, "") != 0) {
130-
zp_config_insert(z_loan(config), Z_CONFIG_PEER_KEY, z_string_make(PEER));
129+
if (strcmp(CONNECT, "") != 0) {
130+
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(CONNECT));
131131
}
132132

133133
// Open Zenoh session

‎examples/mbed/z_get.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
#define CLIENT_OR_PEER 0 // 0: Client mode; 1: Peer mode
2020
#if CLIENT_OR_PEER == 0
2121
#define MODE "client"
22-
#define PEER "" // If empty, it will scout
22+
#define CONNECT "" // If empty, it will scout
2323
#elif CLIENT_OR_PEER == 1
2424
#define MODE "peer"
25-
#define PEER "udp/224.0.0.225:7447#iface=en0"
25+
#define CONNECT "udp/224.0.0.225:7447#iface=en0"
2626
#else
2727
#error "Unknown Zenoh operation mode. Check CLIENT_OR_PEER value."
2828
#endif
@@ -53,8 +53,8 @@ int main(int argc, char **argv) {
5353
// Initialize Zenoh Session and other parameters
5454
z_owned_config_t config = z_config_default();
5555
zp_config_insert(z_config_loan(&config), Z_CONFIG_MODE_KEY, z_string_make(MODE));
56-
if (strcmp(PEER, "") != 0) {
57-
zp_config_insert(z_config_loan(&config), Z_CONFIG_PEER_KEY, z_string_make(PEER));
56+
if (strcmp(CONNECT, "") != 0) {
57+
zp_config_insert(z_config_loan(&config), Z_CONFIG_CONNECT_KEY, z_string_make(CONNECT));
5858
}
5959

6060
// Open Zenoh session

‎examples/mbed/z_pub.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
#define CLIENT_OR_PEER 0 // 0: Client mode; 1: Peer mode
2020
#if CLIENT_OR_PEER == 0
2121
#define MODE "client"
22-
#define PEER "" // If empty, it will scout
22+
#define CONNECT "" // If empty, it will scout
2323
#elif CLIENT_OR_PEER == 1
2424
#define MODE "peer"
25-
#define PEER "udp/224.0.0.225:7447#iface=en0"
25+
#define CONNECT "udp/224.0.0.225:7447#iface=en0"
2626
#else
2727
#error "Unknown Zenoh operation mode. Check CLIENT_OR_PEER value."
2828
#endif
@@ -40,8 +40,8 @@ int main(int argc, char **argv) {
4040
// Initialize Zenoh Session and other parameters
4141
z_owned_config_t config = z_config_default();
4242
zp_config_insert(z_config_loan(&config), Z_CONFIG_MODE_KEY, z_string_make(MODE));
43-
if (strcmp(PEER, "") != 0) {
44-
zp_config_insert(z_config_loan(&config), Z_CONFIG_PEER_KEY, z_string_make(PEER));
43+
if (strcmp(CONNECT, "") != 0) {
44+
zp_config_insert(z_config_loan(&config), Z_CONFIG_CONNECT_KEY, z_string_make(CONNECT));
4545
}
4646

4747
// Open Zenoh session

‎examples/mbed/z_pull.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
#define CLIENT_OR_PEER 0 // 0: Client mode; 1: Peer mode
2020
#if CLIENT_OR_PEER == 0
2121
#define MODE "client"
22-
#define PEER "" // If empty, it will scout
22+
#define CONNECT "" // If empty, it will scout
2323
#elif CLIENT_OR_PEER == 1
2424
#define MODE "peer"
25-
#define PEER "udp/224.0.0.225:7447#iface=en0"
25+
#define CONNECT "udp/224.0.0.225:7447#iface=en0"
2626
#else
2727
#error "Unknown Zenoh operation mode. Check CLIENT_OR_PEER value."
2828
#endif
@@ -46,8 +46,8 @@ int main(int argc, char **argv) {
4646
// Initialize Zenoh Session and other parameters
4747
z_owned_config_t config = z_config_default();
4848
zp_config_insert(z_config_loan(&config), Z_CONFIG_MODE_KEY, z_string_make(MODE));
49-
if (strcmp(PEER, "") != 0) {
50-
zp_config_insert(z_config_loan(&config), Z_CONFIG_PEER_KEY, z_string_make(PEER));
49+
if (strcmp(CONNECT, "") != 0) {
50+
zp_config_insert(z_config_loan(&config), Z_CONFIG_CONNECT_KEY, z_string_make(CONNECT));
5151
}
5252

5353
// Open Zenoh session

‎examples/mbed/z_queryable.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
#define CLIENT_OR_PEER 0 // 0: Client mode; 1: Peer mode
2020
#if CLIENT_OR_PEER == 0
2121
#define MODE "client"
22-
#define PEER "" // If empty, it will scout
22+
#define CONNECT "" // If empty, it will scout
2323
#elif CLIENT_OR_PEER == 1
2424
#define MODE "peer"
25-
#define PEER "udp/224.0.0.225:7447#iface=en0"
25+
#define CONNECT "udp/224.0.0.225:7447#iface=en0"
2626
#else
2727
#error "Unknown Zenoh operation mode. Check CLIENT_OR_PEER value."
2828
#endif
@@ -49,8 +49,8 @@ int main(int argc, char **argv) {
4949
// Initialize Zenoh Session and other parameters
5050
z_owned_config_t config = z_config_default();
5151
zp_config_insert(z_config_loan(&config), Z_CONFIG_MODE_KEY, z_string_make(MODE));
52-
if (strcmp(PEER, "") != 0) {
53-
zp_config_insert(z_config_loan(&config), Z_CONFIG_PEER_KEY, z_string_make(PEER));
52+
if (strcmp(CONNECT, "") != 0) {
53+
zp_config_insert(z_config_loan(&config), Z_CONFIG_CONNECT_KEY, z_string_make(CONNECT));
5454
}
5555

5656
// Open Zenoh session

‎examples/mbed/z_sub.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
#define CLIENT_OR_PEER 0 // 0: Client mode; 1: Peer mode
2020
#if CLIENT_OR_PEER == 0
2121
#define MODE "client"
22-
#define PEER "" // If empty, it will scout
22+
#define CONNECT "" // If empty, it will scout
2323
#elif CLIENT_OR_PEER == 1
2424
#define MODE "peer"
25-
#define PEER "udp/224.0.0.225:7447#iface=en0"
25+
#define CONNECT "udp/224.0.0.225:7447#iface=en0"
2626
#else
2727
#error "Unknown Zenoh operation mode. Check CLIENT_OR_PEER value."
2828
#endif
@@ -46,8 +46,8 @@ int main(int argc, char **argv) {
4646
// Initialize Zenoh Session and other parameters
4747
z_owned_config_t config = z_config_default();
4848
zp_config_insert(z_config_loan(&config), Z_CONFIG_MODE_KEY, z_string_make(MODE));
49-
if (strcmp(PEER, "") != 0) {
50-
zp_config_insert(z_config_loan(&config), Z_CONFIG_PEER_KEY, z_string_make(PEER));
49+
if (strcmp(CONNECT, "") != 0) {
50+
zp_config_insert(z_config_loan(&config), Z_CONFIG_CONNECT_KEY, z_string_make(CONNECT));
5151
}
5252

5353
// Open Zenoh session

‎examples/unix/c11/z_get.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ int main(int argc, char **argv) {
7171
z_owned_config_t config = z_config_default();
7272
zp_config_insert(z_loan(config), Z_CONFIG_MODE_KEY, z_string_make(mode));
7373
if (locator != NULL) {
74-
zp_config_insert(z_loan(config), Z_CONFIG_PEER_KEY, z_string_make(locator));
74+
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(locator));
7575
}
7676

7777
printf("Opening session...\n");

‎examples/unix/c11/z_info.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ int main(int argc, char **argv) {
5555
z_owned_config_t config = z_config_default();
5656
zp_config_insert(z_loan(config), Z_CONFIG_MODE_KEY, z_string_make(mode));
5757
if (locator != NULL) {
58-
zp_config_insert(z_loan(config), Z_CONFIG_PEER_KEY, z_string_make(locator));
58+
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(locator));
5959
}
6060

6161
printf("Opening session...\n");

‎examples/unix/c11/z_pub.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ int main(int argc, char **argv) {
7272
z_owned_config_t config = z_config_default();
7373
zp_config_insert(z_loan(config), Z_CONFIG_MODE_KEY, z_string_make(mode));
7474
if (locator != NULL) {
75-
zp_config_insert(z_loan(config), Z_CONFIG_PEER_KEY, z_string_make(locator));
75+
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(locator));
7676
}
7777

7878
printf("Opening session...\n");

‎examples/unix/c11/z_pub_st.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ int main(int argc, char **argv) {
5555
z_owned_config_t config = z_config_default();
5656
zp_config_insert(z_loan(config), Z_CONFIG_MODE_KEY, z_string_make(mode));
5757
if (locator != NULL) {
58-
zp_config_insert(z_loan(config), Z_CONFIG_PEER_KEY, z_string_make(locator));
58+
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(locator));
5959
}
6060

6161
printf("Opening session...\n");

0 commit comments

Comments
 (0)