@@ -63,7 +63,7 @@ timestamp_now (void)
63
63
return (int64_t ) tv .tv_sec * 1000000 + tv .tv_usec ;
64
64
}
65
65
66
- static int
66
+ static int
67
67
_recv_fully (int fd , void * b , int len )
68
68
{
69
69
int cnt = 0 ;
@@ -84,7 +84,7 @@ _recv_fully(int fd, void *b, int len)
84
84
return cnt ;
85
85
}
86
86
87
- static int
87
+ static int
88
88
_send_fully (int fd , const void * b , int len )
89
89
{
90
90
int cnt = 0 ;
@@ -143,21 +143,21 @@ _connect_to_server(lcm_tcpq_t *self)
143
143
if (self -> socket )
144
144
_close_socket (self -> socket );
145
145
146
- self -> socket = socket (AF_INET ,SOCK_STREAM ,0 );
146
+ self -> socket = socket (AF_INET ,SOCK_STREAM ,0 );
147
147
if (self -> socket < 0 ) {
148
148
perror ("lcm_tcpq socket" );
149
149
return -1 ;
150
150
}
151
151
152
- struct sockaddr_in sa ;
152
+ struct sockaddr_in sa ;
153
153
sa .sin_family = AF_INET ;
154
- sa .sin_port = self -> server_port ;
155
- sa .sin_addr = self -> server_addr ;
154
+ sa .sin_port = self -> server_port ;
155
+ sa .sin_addr = self -> server_addr ;
156
156
157
- if (0 != connect (self -> socket , (struct sockaddr * )& sa , sizeof (sa ))) {
157
+ if (0 != connect (self -> socket , (struct sockaddr * )& sa , sizeof (sa ))) {
158
158
perror ("lcm_tcpq connect" );
159
159
goto fail ;
160
- }
160
+ }
161
161
162
162
if (_send_uint32 (self -> socket , MAGIC_CLIENT ) ||
163
163
_send_uint32 (self -> socket , PROTOCOL_VERSION )) {
@@ -224,8 +224,8 @@ lcm_tcpq_create(lcm_t * parent, const char *network, const GHashTable *args)
224
224
// DNS lookup
225
225
struct hostent * host = gethostbyname (self -> server_addr_str );
226
226
if (!host ) {
227
- fprintf (stderr ,
228
- "LCM tcpq: Couldn't resolve server IP address \"%s\"\n" ,
227
+ fprintf (stderr ,
228
+ "LCM tcpq: Couldn't resolve server IP address \"%s\"\n" ,
229
229
self -> server_addr_str );
230
230
g_strfreev (words );
231
231
lcm_tcpq_destroy (self );
@@ -262,17 +262,17 @@ lcm_tcpq_get_fileno(lcm_tcpq_t *self)
262
262
}
263
263
264
264
static int
265
- _sub_unsub_helper (lcm_tcpq_t * self , const char * channel , uint32_t msg_type )
265
+ _sub_unsub_helper (lcm_tcpq_t * self , const char * channel , uint32_t msg_type )
266
266
{
267
267
if (self -> socket < 0 ) {
268
268
fprintf (stderr , "LCM not connected (%d)\n" , self -> socket );
269
269
return -1 ;
270
270
}
271
-
271
+
272
272
uint32_t channel_len = strlen (channel );
273
- if (_send_uint32 (self -> socket , msg_type ) ||
273
+ if (_send_uint32 (self -> socket , msg_type ) ||
274
274
_send_uint32 (self -> socket , channel_len ) ||
275
- (channel_len != _send_fully (self -> socket , channel , channel_len )))
275
+ (channel_len != _send_fully (self -> socket , channel , channel_len )))
276
276
{
277
277
perror ("LCM tcpq" );
278
278
dbg (DBG_LCM , "Disconnected!\n" );
@@ -353,12 +353,12 @@ lcm_tcpq_handle(lcm_tcpq_t * self)
353
353
uint32_t channel_len ;
354
354
if (_recv_uint32 (self -> socket , & channel_len ))
355
355
goto disconnected ;
356
- if (_ensure_buf_capacity ((void * * )& self -> recv_channel_buf ,
356
+ if (_ensure_buf_capacity ((void * * )& self -> recv_channel_buf ,
357
357
& self -> recv_channel_buf_len , channel_len + 1 )) {
358
358
fprintf (stderr , "Memory allocation error\n" );
359
359
return -1 ;
360
360
}
361
- if (channel_len != _recv_fully (self -> socket , self -> recv_channel_buf ,
361
+ if (channel_len != _recv_fully (self -> socket , self -> recv_channel_buf ,
362
362
channel_len ))
363
363
goto disconnected ;
364
364
self -> recv_channel_buf [channel_len ] = 0 ;
@@ -404,7 +404,7 @@ lcm_tcpq_publish(lcm_tcpq_t *self, const char *channel, const void *data,
404
404
_send_uint32 (self -> socket , channel_len ) ||
405
405
(channel_len != _send_fully (self -> socket , channel , channel_len )) ||
406
406
_send_uint32 (self -> socket , datalen ) ||
407
- (datalen != _send_fully (self -> socket , data , datalen )))
407
+ (datalen != _send_fully (self -> socket , data , datalen )))
408
408
{
409
409
perror ("LCM tcpq send" );
410
410
dbg (DBG_LCM , "Disconnected!\n" );
@@ -422,15 +422,15 @@ static lcm_provider_info_t tcpq_info;
422
422
void
423
423
lcm_tcpq_provider_init (GPtrArray * providers )
424
424
{
425
- tcpq_vtable .create = lcm_tcpq_create ;
425
+ tcpq_vtable .create = lcm_tcpq_create ;
426
426
tcpq_vtable .destroy = lcm_tcpq_destroy ;
427
427
tcpq_vtable .subscribe = lcm_tcpq_subscribe ;
428
428
tcpq_vtable .unsubscribe = lcm_tcpq_unsubscribe ;
429
429
tcpq_vtable .publish = lcm_tcpq_publish ;
430
430
tcpq_vtable .handle = lcm_tcpq_handle ;
431
431
tcpq_vtable .get_fileno = lcm_tcpq_get_fileno ;
432
432
433
- tcpq_info .name = "tcpq" ;
433
+ tcpq_info .name = "tcpq" ;
434
434
tcpq_info .vtable = & tcpq_vtable ;
435
435
436
436
g_ptr_array_add (providers , & tcpq_info );
0 commit comments