@@ -87,19 +87,14 @@ typedef struct _particle_ctrl_GetInterfaceRequest {
87
87
88
88
typedef struct _particle_ctrl_IPConfiguration {
89
89
particle_ctrl_IPConfiguration_Type type ;
90
- bool has_address ;
91
90
particle_ctrl_IPAddress address ;
92
- bool has_netmask ;
93
91
particle_ctrl_IPAddress netmask ;
94
- bool has_gateway ;
95
92
particle_ctrl_IPAddress gateway ;
96
- bool has_dhcp_server ;
97
93
particle_ctrl_IPAddress dhcp_server ;
98
94
pb_callback_t hostname ;
99
95
} particle_ctrl_IPConfiguration ;
100
96
101
97
typedef struct _particle_ctrl_InterfaceAddress {
102
- bool has_address ;
103
98
particle_ctrl_IpAddress address ;
104
99
uint32_t prefix_length ; /* TODO: state, scope, lifetimes, etc. */
105
100
} particle_ctrl_InterfaceAddress ;
@@ -113,10 +108,8 @@ typedef struct _particle_ctrl_InterfaceEntry {
113
108
typedef struct _particle_ctrl_Ipv4Config {
114
109
pb_callback_t addresses ;
115
110
/* On P2P links */
116
- bool has_peer ;
117
111
particle_ctrl_Ipv4Address peer ;
118
112
/* Temporary, will be moved to routing table */
119
- bool has_gateway ;
120
113
particle_ctrl_Ipv4Address gateway ;
121
114
} particle_ctrl_Ipv4Config ;
122
115
@@ -136,9 +129,7 @@ typedef struct _particle_ctrl_Interface {
136
129
particle_ctrl_InterfaceType type ;
137
130
uint32_t flags ; /* InterfaceFlag */
138
131
uint32_t ext_flags ; /* InterfaceExtFlag */
139
- bool has_ipv4_config ;
140
132
particle_ctrl_Ipv4Config ipv4_config ;
141
- bool has_ipv6_config ;
142
133
particle_ctrl_Ipv6Config ipv6_config ;
143
134
particle_ctrl_Interface_hw_address_t hw_address ;
144
135
uint32_t mtu ;
@@ -151,29 +142,23 @@ typedef struct _particle_ctrl_NetworkConfiguration {
151
142
particle_ctrl_NetworkState state ;
152
143
pb_callback_t name ;
153
144
particle_ctrl_NetworkConfiguration_mac_t mac ;
154
- bool has_ipconfig ;
155
145
particle_ctrl_IPConfiguration ipconfig ;
156
- bool has_dnsconfig ;
157
146
particle_ctrl_DNSConfiguration dnsconfig ;
158
147
} particle_ctrl_NetworkConfiguration ;
159
148
160
149
typedef struct _particle_ctrl_GetInterfaceReply {
161
- bool has_interface ;
162
150
particle_ctrl_Interface interface ;
163
151
} particle_ctrl_GetInterfaceReply ;
164
152
165
153
typedef struct _particle_ctrl_NetworkGetConfigurationReply {
166
- bool has_config ;
167
154
particle_ctrl_NetworkConfiguration config ;
168
155
} particle_ctrl_NetworkGetConfigurationReply ;
169
156
170
157
typedef struct _particle_ctrl_NetworkGetStatusReply {
171
- bool has_config ;
172
158
particle_ctrl_NetworkConfiguration config ;
173
159
} particle_ctrl_NetworkGetStatusReply ;
174
160
175
161
typedef struct _particle_ctrl_NetworkSetConfigurationRequest {
176
- bool has_config ;
177
162
particle_ctrl_NetworkConfiguration config ;
178
163
} particle_ctrl_NetworkSetConfigurationRequest ;
179
164
@@ -206,41 +191,41 @@ extern "C" {
206
191
207
192
/* Initializer values for message structs */
208
193
#define particle_ctrl_NetworkGetStatusRequest_init_default {0}
209
- #define particle_ctrl_NetworkGetStatusReply_init_default {false, particle_ctrl_NetworkConfiguration_init_default}
194
+ #define particle_ctrl_NetworkGetStatusReply_init_default {particle_ctrl_NetworkConfiguration_init_default}
210
195
#define particle_ctrl_NetworkGetConfigurationRequest_init_default {0}
211
- #define particle_ctrl_NetworkGetConfigurationReply_init_default {false, particle_ctrl_NetworkConfiguration_init_default}
212
- #define particle_ctrl_NetworkSetConfigurationRequest_init_default {false, particle_ctrl_NetworkConfiguration_init_default}
196
+ #define particle_ctrl_NetworkGetConfigurationReply_init_default {particle_ctrl_NetworkConfiguration_init_default}
197
+ #define particle_ctrl_NetworkSetConfigurationRequest_init_default {particle_ctrl_NetworkConfiguration_init_default}
213
198
#define particle_ctrl_NetworkSetConfigurationReply_init_default {0}
214
- #define particle_ctrl_IPConfiguration_init_default {_particle_ctrl_IPConfiguration_Type_MIN, false, particle_ctrl_IPAddress_init_default, false, particle_ctrl_IPAddress_init_default, false, particle_ctrl_IPAddress_init_default, false , particle_ctrl_IPAddress_init_default, {{NULL}, NULL}}
199
+ #define particle_ctrl_IPConfiguration_init_default {_particle_ctrl_IPConfiguration_Type_MIN, particle_ctrl_IPAddress_init_default, particle_ctrl_IPAddress_init_default, particle_ctrl_IPAddress_init_default, particle_ctrl_IPAddress_init_default, {{NULL}, NULL}}
215
200
#define particle_ctrl_DNSConfiguration_init_default {{{NULL}, NULL}}
216
- #define particle_ctrl_NetworkConfiguration_init_default {0, _particle_ctrl_NetworkState_MIN, {{NULL}, NULL}, {0, {0}}, false, particle_ctrl_IPConfiguration_init_default, false , particle_ctrl_DNSConfiguration_init_default}
217
- #define particle_ctrl_InterfaceAddress_init_default {false, particle_ctrl_IpAddress_init_default, 0}
218
- #define particle_ctrl_Ipv4Config_init_default {{{NULL}, NULL}, false, particle_ctrl_Ipv4Address_init_default, false , particle_ctrl_Ipv4Address_init_default}
201
+ #define particle_ctrl_NetworkConfiguration_init_default {0, _particle_ctrl_NetworkState_MIN, {{NULL}, NULL}, {0, {0}}, particle_ctrl_IPConfiguration_init_default, particle_ctrl_DNSConfiguration_init_default}
202
+ #define particle_ctrl_InterfaceAddress_init_default {particle_ctrl_IpAddress_init_default, 0}
203
+ #define particle_ctrl_Ipv4Config_init_default {{{NULL}, NULL}, particle_ctrl_Ipv4Address_init_default, particle_ctrl_Ipv4Address_init_default}
219
204
#define particle_ctrl_Ipv6Config_init_default {{{NULL}, NULL}}
220
- #define particle_ctrl_Interface_init_default {0, {{NULL}, NULL}, _particle_ctrl_InterfaceType_MIN, 0, 0, false, particle_ctrl_Ipv4Config_init_default, false , particle_ctrl_Ipv6Config_init_default, {0, {0}}, 0, 0}
205
+ #define particle_ctrl_Interface_init_default {0, {{NULL}, NULL}, _particle_ctrl_InterfaceType_MIN, 0, 0, particle_ctrl_Ipv4Config_init_default, particle_ctrl_Ipv6Config_init_default, {0, {0}}, 0, 0}
221
206
#define particle_ctrl_InterfaceEntry_init_default {0, {{NULL}, NULL}, _particle_ctrl_InterfaceType_MIN}
222
207
#define particle_ctrl_GetInterfaceListRequest_init_default {0}
223
208
#define particle_ctrl_GetInterfaceListReply_init_default {{{NULL}, NULL}}
224
209
#define particle_ctrl_GetInterfaceRequest_init_default {0}
225
- #define particle_ctrl_GetInterfaceReply_init_default {false, particle_ctrl_Interface_init_default}
210
+ #define particle_ctrl_GetInterfaceReply_init_default {particle_ctrl_Interface_init_default}
226
211
#define particle_ctrl_NetworkGetStatusRequest_init_zero {0}
227
- #define particle_ctrl_NetworkGetStatusReply_init_zero {false, particle_ctrl_NetworkConfiguration_init_zero}
212
+ #define particle_ctrl_NetworkGetStatusReply_init_zero {particle_ctrl_NetworkConfiguration_init_zero}
228
213
#define particle_ctrl_NetworkGetConfigurationRequest_init_zero {0}
229
- #define particle_ctrl_NetworkGetConfigurationReply_init_zero {false, particle_ctrl_NetworkConfiguration_init_zero}
230
- #define particle_ctrl_NetworkSetConfigurationRequest_init_zero {false, particle_ctrl_NetworkConfiguration_init_zero}
214
+ #define particle_ctrl_NetworkGetConfigurationReply_init_zero {particle_ctrl_NetworkConfiguration_init_zero}
215
+ #define particle_ctrl_NetworkSetConfigurationRequest_init_zero {particle_ctrl_NetworkConfiguration_init_zero}
231
216
#define particle_ctrl_NetworkSetConfigurationReply_init_zero {0}
232
- #define particle_ctrl_IPConfiguration_init_zero {_particle_ctrl_IPConfiguration_Type_MIN, false, particle_ctrl_IPAddress_init_zero, false, particle_ctrl_IPAddress_init_zero, false, particle_ctrl_IPAddress_init_zero, false , particle_ctrl_IPAddress_init_zero, {{NULL}, NULL}}
217
+ #define particle_ctrl_IPConfiguration_init_zero {_particle_ctrl_IPConfiguration_Type_MIN, particle_ctrl_IPAddress_init_zero, particle_ctrl_IPAddress_init_zero, particle_ctrl_IPAddress_init_zero, particle_ctrl_IPAddress_init_zero, {{NULL}, NULL}}
233
218
#define particle_ctrl_DNSConfiguration_init_zero {{{NULL}, NULL}}
234
- #define particle_ctrl_NetworkConfiguration_init_zero {0, _particle_ctrl_NetworkState_MIN, {{NULL}, NULL}, {0, {0}}, false, particle_ctrl_IPConfiguration_init_zero, false , particle_ctrl_DNSConfiguration_init_zero}
235
- #define particle_ctrl_InterfaceAddress_init_zero {false, particle_ctrl_IpAddress_init_zero, 0}
236
- #define particle_ctrl_Ipv4Config_init_zero {{{NULL}, NULL}, false, particle_ctrl_Ipv4Address_init_zero, false , particle_ctrl_Ipv4Address_init_zero}
219
+ #define particle_ctrl_NetworkConfiguration_init_zero {0, _particle_ctrl_NetworkState_MIN, {{NULL}, NULL}, {0, {0}}, particle_ctrl_IPConfiguration_init_zero, particle_ctrl_DNSConfiguration_init_zero}
220
+ #define particle_ctrl_InterfaceAddress_init_zero {particle_ctrl_IpAddress_init_zero, 0}
221
+ #define particle_ctrl_Ipv4Config_init_zero {{{NULL}, NULL}, particle_ctrl_Ipv4Address_init_zero, particle_ctrl_Ipv4Address_init_zero}
237
222
#define particle_ctrl_Ipv6Config_init_zero {{{NULL}, NULL}}
238
- #define particle_ctrl_Interface_init_zero {0, {{NULL}, NULL}, _particle_ctrl_InterfaceType_MIN, 0, 0, false, particle_ctrl_Ipv4Config_init_zero, false , particle_ctrl_Ipv6Config_init_zero, {0, {0}}, 0, 0}
223
+ #define particle_ctrl_Interface_init_zero {0, {{NULL}, NULL}, _particle_ctrl_InterfaceType_MIN, 0, 0, particle_ctrl_Ipv4Config_init_zero, particle_ctrl_Ipv6Config_init_zero, {0, {0}}, 0, 0}
239
224
#define particle_ctrl_InterfaceEntry_init_zero {0, {{NULL}, NULL}, _particle_ctrl_InterfaceType_MIN}
240
225
#define particle_ctrl_GetInterfaceListRequest_init_zero {0}
241
226
#define particle_ctrl_GetInterfaceListReply_init_zero {{{NULL}, NULL}}
242
227
#define particle_ctrl_GetInterfaceRequest_init_zero {0}
243
- #define particle_ctrl_GetInterfaceReply_init_zero {false, particle_ctrl_Interface_init_zero}
228
+ #define particle_ctrl_GetInterfaceReply_init_zero {particle_ctrl_Interface_init_zero}
244
229
245
230
/* Field tags (for use in manual encoding/decoding) */
246
231
#define particle_ctrl_DNSConfiguration_servers_tag 1
@@ -291,7 +276,7 @@ X(a, STATIC, SINGULAR, INT32, interface, 1)
291
276
#define particle_ctrl_NetworkGetStatusRequest_DEFAULT NULL
292
277
293
278
#define particle_ctrl_NetworkGetStatusReply_FIELDLIST (X , a ) \
294
- X(a, STATIC, OPTIONAL , MESSAGE, config, 1)
279
+ X(a, STATIC, SINGULAR , MESSAGE, config, 1)
295
280
#define particle_ctrl_NetworkGetStatusReply_CALLBACK NULL
296
281
#define particle_ctrl_NetworkGetStatusReply_DEFAULT NULL
297
282
#define particle_ctrl_NetworkGetStatusReply_config_MSGTYPE particle_ctrl_NetworkConfiguration
@@ -302,13 +287,13 @@ X(a, STATIC, SINGULAR, INT32, interface, 1)
302
287
#define particle_ctrl_NetworkGetConfigurationRequest_DEFAULT NULL
303
288
304
289
#define particle_ctrl_NetworkGetConfigurationReply_FIELDLIST (X , a ) \
305
- X(a, STATIC, OPTIONAL , MESSAGE, config, 1)
290
+ X(a, STATIC, SINGULAR , MESSAGE, config, 1)
306
291
#define particle_ctrl_NetworkGetConfigurationReply_CALLBACK NULL
307
292
#define particle_ctrl_NetworkGetConfigurationReply_DEFAULT NULL
308
293
#define particle_ctrl_NetworkGetConfigurationReply_config_MSGTYPE particle_ctrl_NetworkConfiguration
309
294
310
295
#define particle_ctrl_NetworkSetConfigurationRequest_FIELDLIST (X , a ) \
311
- X(a, STATIC, OPTIONAL , MESSAGE, config, 1)
296
+ X(a, STATIC, SINGULAR , MESSAGE, config, 1)
312
297
#define particle_ctrl_NetworkSetConfigurationRequest_CALLBACK NULL
313
298
#define particle_ctrl_NetworkSetConfigurationRequest_DEFAULT NULL
314
299
#define particle_ctrl_NetworkSetConfigurationRequest_config_MSGTYPE particle_ctrl_NetworkConfiguration
@@ -320,10 +305,10 @@ X(a, STATIC, OPTIONAL, MESSAGE, config, 1)
320
305
321
306
#define particle_ctrl_IPConfiguration_FIELDLIST (X , a ) \
322
307
X(a, STATIC, SINGULAR, UENUM, type, 1) \
323
- X(a, STATIC, OPTIONAL , MESSAGE, address, 2) \
324
- X(a, STATIC, OPTIONAL , MESSAGE, netmask, 3) \
325
- X(a, STATIC, OPTIONAL , MESSAGE, gateway, 4) \
326
- X(a, STATIC, OPTIONAL , MESSAGE, dhcp_server, 5) \
308
+ X(a, STATIC, SINGULAR , MESSAGE, address, 2) \
309
+ X(a, STATIC, SINGULAR , MESSAGE, netmask, 3) \
310
+ X(a, STATIC, SINGULAR , MESSAGE, gateway, 4) \
311
+ X(a, STATIC, SINGULAR , MESSAGE, dhcp_server, 5) \
327
312
X(a, CALLBACK, SINGULAR, STRING, hostname, 6)
328
313
#define particle_ctrl_IPConfiguration_CALLBACK pb_default_field_callback
329
314
#define particle_ctrl_IPConfiguration_DEFAULT NULL
@@ -343,24 +328,24 @@ X(a, STATIC, SINGULAR, INT32, interface, 1) \
343
328
X(a, STATIC, SINGULAR, UENUM, state, 2) \
344
329
X(a, CALLBACK, SINGULAR, STRING, name, 3) \
345
330
X(a, STATIC, SINGULAR, BYTES, mac, 4) \
346
- X(a, STATIC, OPTIONAL , MESSAGE, ipconfig, 5) \
347
- X(a, STATIC, OPTIONAL , MESSAGE, dnsconfig, 6)
331
+ X(a, STATIC, SINGULAR , MESSAGE, ipconfig, 5) \
332
+ X(a, STATIC, SINGULAR , MESSAGE, dnsconfig, 6)
348
333
#define particle_ctrl_NetworkConfiguration_CALLBACK pb_default_field_callback
349
334
#define particle_ctrl_NetworkConfiguration_DEFAULT NULL
350
335
#define particle_ctrl_NetworkConfiguration_ipconfig_MSGTYPE particle_ctrl_IPConfiguration
351
336
#define particle_ctrl_NetworkConfiguration_dnsconfig_MSGTYPE particle_ctrl_DNSConfiguration
352
337
353
338
#define particle_ctrl_InterfaceAddress_FIELDLIST (X , a ) \
354
- X(a, STATIC, OPTIONAL , MESSAGE, address, 1) \
339
+ X(a, STATIC, SINGULAR , MESSAGE, address, 1) \
355
340
X(a, STATIC, SINGULAR, UINT32, prefix_length, 2)
356
341
#define particle_ctrl_InterfaceAddress_CALLBACK NULL
357
342
#define particle_ctrl_InterfaceAddress_DEFAULT NULL
358
343
#define particle_ctrl_InterfaceAddress_address_MSGTYPE particle_ctrl_IpAddress
359
344
360
345
#define particle_ctrl_Ipv4Config_FIELDLIST (X , a ) \
361
346
X(a, CALLBACK, REPEATED, MESSAGE, addresses, 1) \
362
- X(a, STATIC, OPTIONAL , MESSAGE, peer, 2) \
363
- X(a, STATIC, OPTIONAL , MESSAGE, gateway, 3)
347
+ X(a, STATIC, SINGULAR , MESSAGE, peer, 2) \
348
+ X(a, STATIC, SINGULAR , MESSAGE, gateway, 3)
364
349
#define particle_ctrl_Ipv4Config_CALLBACK pb_default_field_callback
365
350
#define particle_ctrl_Ipv4Config_DEFAULT NULL
366
351
#define particle_ctrl_Ipv4Config_addresses_MSGTYPE particle_ctrl_InterfaceAddress
@@ -379,8 +364,8 @@ X(a, CALLBACK, SINGULAR, STRING, name, 2) \
379
364
X(a, STATIC, SINGULAR, UENUM, type, 3) \
380
365
X(a, STATIC, SINGULAR, UINT32, flags, 4) \
381
366
X(a, STATIC, SINGULAR, UINT32, ext_flags, 5) \
382
- X(a, STATIC, OPTIONAL , MESSAGE, ipv4_config, 6) \
383
- X(a, STATIC, OPTIONAL , MESSAGE, ipv6_config, 7) \
367
+ X(a, STATIC, SINGULAR , MESSAGE, ipv4_config, 6) \
368
+ X(a, STATIC, SINGULAR , MESSAGE, ipv6_config, 7) \
384
369
X(a, STATIC, SINGULAR, BYTES, hw_address, 8) \
385
370
X(a, STATIC, SINGULAR, UINT32, mtu, 9) \
386
371
X(a, STATIC, SINGULAR, UINT32, metric, 10)
@@ -413,7 +398,7 @@ X(a, STATIC, SINGULAR, UINT32, index, 1)
413
398
#define particle_ctrl_GetInterfaceRequest_DEFAULT NULL
414
399
415
400
#define particle_ctrl_GetInterfaceReply_FIELDLIST (X , a ) \
416
- X(a, STATIC, OPTIONAL , MESSAGE, interface, 1)
401
+ X(a, STATIC, SINGULAR , MESSAGE, interface, 1)
417
402
#define particle_ctrl_GetInterfaceReply_CALLBACK NULL
418
403
#define particle_ctrl_GetInterfaceReply_DEFAULT NULL
419
404
#define particle_ctrl_GetInterfaceReply_interface_MSGTYPE particle_ctrl_Interface
0 commit comments