Skip to content

Commit 29a57a1

Browse files
p-avitalp-avital
authored
add -l option to examples (#248)
1 parent 3e366a5 commit 29a57a1

19 files changed

+223
-106
lines changed

‎examples/unix/c11/z_get.c

+13-6
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,30 @@ void reply_handler(z_owned_reply_t *reply, void *ctx) {
3838
int main(int argc, char **argv) {
3939
const char *keyexpr = "demo/example/**";
4040
const char *mode = "client";
41-
const char *locator = NULL;
41+
const char *clocator = NULL;
42+
const char *llocator = NULL;
4243
const char *value = NULL;
4344

4445
int opt;
45-
while ((opt = getopt(argc, argv, "k:e:m:v:")) != -1) {
46+
while ((opt = getopt(argc, argv, "k:e:m:v:l:")) != -1) {
4647
switch (opt) {
4748
case 'k':
4849
keyexpr = optarg;
4950
break;
5051
case 'e':
51-
locator = optarg;
52+
clocator = optarg;
5253
break;
5354
case 'm':
5455
mode = optarg;
5556
break;
57+
case 'l':
58+
llocator = optarg;
59+
break;
5660
case 'v':
5761
value = optarg;
5862
break;
5963
case '?':
60-
if (optopt == 'k' || optopt == 'e' || optopt == 'm' || optopt == 'v') {
64+
if (optopt == 'k' || optopt == 'e' || optopt == 'm' || optopt == 'v' || optopt == 'l') {
6165
fprintf(stderr, "Option -%c requires an argument.\n", optopt);
6266
} else {
6367
fprintf(stderr, "Unknown option `-%c'.\n", optopt);
@@ -70,8 +74,11 @@ int main(int argc, char **argv) {
7074

7175
z_owned_config_t config = z_config_default();
7276
zp_config_insert(z_loan(config), Z_CONFIG_MODE_KEY, z_string_make(mode));
73-
if (locator != NULL) {
74-
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(locator));
77+
if (clocator != NULL) {
78+
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(clocator));
79+
}
80+
if (llocator != NULL) {
81+
zp_config_insert(z_loan(config), Z_CONFIG_LISTEN_KEY, z_string_make(llocator));
7582
}
7683

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

‎examples/unix/c11/z_info.c

+13-6
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,23 @@ void print_zid(const z_id_t *id, void *ctx) {
2929

3030
int main(int argc, char **argv) {
3131
const char *mode = "client";
32-
char *locator = NULL;
32+
char *clocator = NULL;
33+
char *llocator = NULL;
3334

3435
int opt;
35-
while ((opt = getopt(argc, argv, "e:m:")) != -1) {
36+
while ((opt = getopt(argc, argv, "e:m:l:")) != -1) {
3637
switch (opt) {
3738
case 'e':
38-
locator = optarg;
39+
clocator = optarg;
3940
break;
4041
case 'm':
4142
mode = optarg;
4243
break;
44+
case 'l':
45+
llocator = optarg;
46+
break;
4347
case '?':
44-
if (optopt == 'e' || optopt == 'm') {
48+
if (optopt == 'e' || optopt == 'm' || optopt == 'l') {
4549
fprintf(stderr, "Option -%c requires an argument.\n", optopt);
4650
} else {
4751
fprintf(stderr, "Unknown option `-%c'.\n", optopt);
@@ -54,8 +58,11 @@ int main(int argc, char **argv) {
5458

5559
z_owned_config_t config = z_config_default();
5660
zp_config_insert(z_loan(config), Z_CONFIG_MODE_KEY, z_string_make(mode));
57-
if (locator != NULL) {
58-
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(locator));
61+
if (clocator != NULL) {
62+
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(clocator));
63+
}
64+
if (llocator != NULL) {
65+
zp_config_insert(z_loan(config), Z_CONFIG_LISTEN_KEY, z_string_make(llocator));
5966
}
6067

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

‎examples/unix/c11/z_pub.c

+10-12
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ int main(int argc, char **argv) {
2727
char *const default_value = "Pub from Pico!";
2828
char *value = default_value;
2929
const char *mode = "client";
30-
char *locator = NULL;
30+
char *clocator = NULL;
31+
char *llocator = NULL;
3132
int n = 10;
3233

3334
int opt;
@@ -40,25 +41,19 @@ int main(int argc, char **argv) {
4041
value = optarg;
4142
break;
4243
case 'e':
43-
locator = optarg;
44+
clocator = optarg;
4445
break;
4546
case 'm':
4647
mode = optarg;
4748
break;
4849
case 'l':
49-
opt = atoi(optarg);
50-
value = z_malloc(opt + 1);
51-
memset(value, 'A', opt);
52-
value[opt] = 0;
53-
for (int i = opt - 1; opt > 0; i--, opt /= 10) {
54-
value[i] = '0' + (opt % 10);
55-
}
50+
llocator = optarg;
5651
break;
5752
case 'n':
5853
n = atoi(optarg);
5954
break;
6055
case '?':
61-
if (optopt == 'k' || optopt == 'v' || optopt == 'e' || optopt == 'm') {
56+
if (optopt == 'k' || optopt == 'v' || optopt == 'e' || optopt == 'm' || optopt == 'l') {
6257
fprintf(stderr, "Option -%c requires an argument.\n", optopt);
6358
} else {
6459
fprintf(stderr, "Unknown option `-%c'.\n", optopt);
@@ -71,8 +66,11 @@ int main(int argc, char **argv) {
7166

7267
z_owned_config_t config = z_config_default();
7368
zp_config_insert(z_loan(config), Z_CONFIG_MODE_KEY, z_string_make(mode));
74-
if (locator != NULL) {
75-
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(locator));
69+
if (clocator != NULL) {
70+
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(clocator));
71+
}
72+
if (llocator != NULL) {
73+
zp_config_insert(z_loan(config), Z_CONFIG_LISTEN_KEY, z_string_make(llocator));
7674
}
7775

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

‎examples/unix/c11/z_pub_st.c

+13-6
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ int main(int argc, char **argv) {
2323
const char *keyexpr = "demo/example/zenoh-pico-pub";
2424
const char *value = "Pub from Pico!";
2525
const char *mode = "client";
26-
char *locator = NULL;
26+
char *clocator = NULL;
27+
char *llocator = NULL;
2728

2829
int opt;
29-
while ((opt = getopt(argc, argv, "k:v:e:m:")) != -1) {
30+
while ((opt = getopt(argc, argv, "k:v:e:m:l:")) != -1) {
3031
switch (opt) {
3132
case 'k':
3233
keyexpr = optarg;
@@ -35,13 +36,16 @@ int main(int argc, char **argv) {
3536
value = optarg;
3637
break;
3738
case 'e':
38-
locator = optarg;
39+
clocator = optarg;
3940
break;
4041
case 'm':
4142
mode = optarg;
4243
break;
44+
case 'l':
45+
llocator = optarg;
46+
break;
4347
case '?':
44-
if (optopt == 'k' || optopt == 'v' || optopt == 'e' || optopt == 'm') {
48+
if (optopt == 'k' || optopt == 'v' || optopt == 'e' || optopt == 'm' || optopt == 'l') {
4549
fprintf(stderr, "Option -%c requires an argument.\n", optopt);
4650
} else {
4751
fprintf(stderr, "Unknown option `-%c'.\n", optopt);
@@ -54,8 +58,11 @@ int main(int argc, char **argv) {
5458

5559
z_owned_config_t config = z_config_default();
5660
zp_config_insert(z_loan(config), Z_CONFIG_MODE_KEY, z_string_make(mode));
57-
if (locator != NULL) {
58-
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(locator));
61+
if (clocator != NULL) {
62+
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(clocator));
63+
}
64+
if (llocator != NULL) {
65+
zp_config_insert(z_loan(config), Z_CONFIG_LISTEN_KEY, z_string_make(llocator));
5966
}
6067

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

‎examples/unix/c11/z_put.c

+13-6
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ int main(int argc, char **argv) {
2323
const char *keyexpr = "demo/example/zenoh-pico-put";
2424
const char *value = "Pub from Pico!";
2525
const char *mode = "client";
26-
char *locator = NULL;
26+
char *clocator = NULL;
27+
char *llocator = NULL;
2728

2829
int opt;
29-
while ((opt = getopt(argc, argv, "k:v:e:m:")) != -1) {
30+
while ((opt = getopt(argc, argv, "k:v:e:m:l:")) != -1) {
3031
switch (opt) {
3132
case 'k':
3233
keyexpr = optarg;
@@ -35,13 +36,16 @@ int main(int argc, char **argv) {
3536
value = optarg;
3637
break;
3738
case 'e':
38-
locator = optarg;
39+
clocator = optarg;
3940
break;
4041
case 'm':
4142
mode = optarg;
4243
break;
44+
case 'l':
45+
llocator = optarg;
46+
break;
4347
case '?':
44-
if (optopt == 'k' || optopt == 'v' || optopt == 'e' || optopt == 'm') {
48+
if (optopt == 'k' || optopt == 'v' || optopt == 'e' || optopt == 'm' || optopt == 'l') {
4549
fprintf(stderr, "Option -%c requires an argument.\n", optopt);
4650
} else {
4751
fprintf(stderr, "Unknown option `-%c'.\n", optopt);
@@ -54,8 +58,11 @@ int main(int argc, char **argv) {
5458

5559
z_owned_config_t config = z_config_default();
5660
zp_config_insert(z_loan(config), Z_CONFIG_MODE_KEY, z_string_make(mode));
57-
if (locator != NULL) {
58-
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(locator));
61+
if (clocator != NULL) {
62+
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(clocator));
63+
}
64+
if (llocator != NULL) {
65+
zp_config_insert(z_loan(config), Z_CONFIG_LISTEN_KEY, z_string_make(llocator));
5966
}
6067

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

‎examples/unix/c11/z_queryable.c

+13-6
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,29 @@ void query_handler(const z_query_t *query, void *ctx) {
3838

3939
int main(int argc, char **argv) {
4040
const char *mode = "client";
41-
char *locator = NULL;
41+
char *clocator = NULL;
42+
char *llocator = NULL;
4243

4344
int opt;
44-
while ((opt = getopt(argc, argv, "k:e:m:v:")) != -1) {
45+
while ((opt = getopt(argc, argv, "k:e:m:v:l:")) != -1) {
4546
switch (opt) {
4647
case 'k':
4748
keyexpr = optarg;
4849
break;
4950
case 'e':
50-
locator = optarg;
51+
clocator = optarg;
5152
break;
5253
case 'm':
5354
mode = optarg;
5455
break;
56+
case 'l':
57+
llocator = optarg;
58+
break;
5559
case 'v':
5660
value = optarg;
5761
break;
5862
case '?':
59-
if (optopt == 'k' || optopt == 'e' || optopt == 'm' || optopt == 'v') {
63+
if (optopt == 'k' || optopt == 'e' || optopt == 'm' || optopt == 'v' || optopt == 'l') {
6064
fprintf(stderr, "Option -%c requires an argument.\n", optopt);
6165
} else {
6266
fprintf(stderr, "Unknown option `-%c'.\n", optopt);
@@ -69,8 +73,11 @@ int main(int argc, char **argv) {
6973

7074
z_owned_config_t config = z_config_default();
7175
zp_config_insert(z_loan(config), Z_CONFIG_MODE_KEY, z_string_make(mode));
72-
if (locator != NULL) {
73-
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(locator));
76+
if (clocator != NULL) {
77+
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(clocator));
78+
}
79+
if (llocator != NULL) {
80+
zp_config_insert(z_loan(config), Z_CONFIG_LISTEN_KEY, z_string_make(llocator));
7481
}
7582

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

‎examples/unix/c11/z_sub.c

+13-6
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,26 @@ void data_handler(const z_sample_t *sample, void *ctx) {
3030
int main(int argc, char **argv) {
3131
const char *keyexpr = "demo/example/**";
3232
const char *mode = "client";
33-
char *locator = NULL;
33+
char *clocator = NULL;
34+
char *llocator = NULL;
3435

3536
int opt;
36-
while ((opt = getopt(argc, argv, "k:e:m:")) != -1) {
37+
while ((opt = getopt(argc, argv, "k:e:m:l:")) != -1) {
3738
switch (opt) {
3839
case 'k':
3940
keyexpr = optarg;
4041
break;
4142
case 'e':
42-
locator = optarg;
43+
clocator = optarg;
4344
break;
4445
case 'm':
4546
mode = optarg;
4647
break;
48+
case 'l':
49+
llocator = optarg;
50+
break;
4751
case '?':
48-
if (optopt == 'k' || optopt == 'e' || optopt == 'm') {
52+
if (optopt == 'k' || optopt == 'e' || optopt == 'm' || optopt == 'l') {
4953
fprintf(stderr, "Option -%c requires an argument.\n", optopt);
5054
} else {
5155
fprintf(stderr, "Unknown option `-%c'.\n", optopt);
@@ -58,8 +62,11 @@ int main(int argc, char **argv) {
5862

5963
z_owned_config_t config = z_config_default();
6064
zp_config_insert(z_loan(config), Z_CONFIG_MODE_KEY, z_string_make(mode));
61-
if (locator != NULL) {
62-
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(locator));
65+
if (clocator != NULL) {
66+
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(clocator));
67+
}
68+
if (llocator != NULL) {
69+
zp_config_insert(z_loan(config), Z_CONFIG_LISTEN_KEY, z_string_make(llocator));
6370
}
6471

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

‎examples/unix/c11/z_sub_st.c

+13-6
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,26 @@ void data_handler(const z_sample_t *sample, void *ctx) {
3030
int main(int argc, char **argv) {
3131
const char *keyexpr = "demo/example/**";
3232
const char *mode = "client";
33-
char *locator = NULL;
33+
char *clocator = NULL;
34+
char *llocator = NULL;
3435

3536
int opt;
36-
while ((opt = getopt(argc, argv, "k:e:m:")) != -1) {
37+
while ((opt = getopt(argc, argv, "k:e:m:l:")) != -1) {
3738
switch (opt) {
3839
case 'k':
3940
keyexpr = optarg;
4041
break;
4142
case 'e':
42-
locator = optarg;
43+
clocator = optarg;
4344
break;
4445
case 'm':
4546
mode = optarg;
4647
break;
48+
case 'l':
49+
llocator = optarg;
50+
break;
4751
case '?':
48-
if (optopt == 'k' || optopt == 'e' || optopt == 'm') {
52+
if (optopt == 'k' || optopt == 'e' || optopt == 'm' || optopt == 'l') {
4953
fprintf(stderr, "Option -%c requires an argument.\n", optopt);
5054
} else {
5155
fprintf(stderr, "Unknown option `-%c'.\n", optopt);
@@ -58,8 +62,11 @@ int main(int argc, char **argv) {
5862

5963
z_owned_config_t config = z_config_default();
6064
zp_config_insert(z_loan(config), Z_CONFIG_MODE_KEY, z_string_make(mode));
61-
if (locator != NULL) {
62-
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(locator));
65+
if (clocator != NULL) {
66+
zp_config_insert(z_loan(config), Z_CONFIG_CONNECT_KEY, z_string_make(clocator));
67+
}
68+
if (llocator != NULL) {
69+
zp_config_insert(z_loan(config), Z_CONFIG_LISTEN_KEY, z_string_make(llocator));
6370
}
6471

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

0 commit comments

Comments
 (0)