Allow connection to a tcp dbus address
cover Allow connection to a tcp dbus address
This patch came from a demand in a project with industrial IoT for monitoring a PLC (creating supervisor apps). The infrastructure was built from a DBus service that can be accessed by a front-end in the same local network.
Ramon Ribeiro (2):
dbus: Add support to tcp address
unit: dbus: Add unit test to dbus tcp address
.gitignore | 1 + Makefile.am | 3 + ell/dbus.c | 95 ++++++++++++++++++- unit/dbus.conf | 2 + unit/test-dbus-tcp.c | 261 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 358 insertions(+), 4 deletions(-) create mode 100644 unit/test-dbus-tcp.c
Signature · 1 line
2.11.0
PATCH 1/2 dbus: Add support to tcp address
From: Ramon Ribeiro <[email protected]>
This patch allows a dbus client to connect to a dbus-daemon server address listenning a TCP transport protocol
--- ell/dbus.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 91 insertions(+), 4 deletions(-)
ell/dbus.c +91 -4
@@ -31,8 +31,10 @@#include <stdarg.h> #include <stdlib.h> #include <string.h> +#include <netdb.h> #include <sys/socket.h> #include <sys/un.h> +#include <netinet/in.h> #include <errno.h> #include "util.h"
@@ -75,6 +77,7 @@ struct l_dbus_ops {struct l_dbus {struct l_io *io;char *guid; +char *transport;bool negotiate_unix_fd;bool support_unix_fd;bool is_ready;
@@ -511,7 +514,10 @@ static bool auth_read_handler(struct l_io *io, void *user_data) }else if (!strncmp (ptr,"REJECTED " ,9 )) {static const char *command ="AUTH ANONYMOUS\r\n" ; - dbus->negotiate_unix_fd = true; +if (!strcmp (dbus->transport,"unix" )) + dbus->negotiate_unix_fd = true; +else + dbus->negotiate_unix_fd = false; classic->auth_command =l_strdup (command); classic->auth_state =WAITING_FOR_OK ;
@@ -1033,7 +1039,8 @@ static const struct l_dbus_ops classic_ops = { .name_acquire = classic_name_acquire, }; -static struct l_dbus *setup_dbus1 (int fd,const char *guid) +static struct l_dbus *setup_dbus1 (int fd,const char *guid, +const char *transport) {static const unsigned char creds =0x00 ;char uid[6 ], hexuid[12 ], *ptr = hexuid;
@@ -1065,11 +1072,13 @@ static struct l_dbus *setup_dbus1(int fd, const char *guid)dbus_init (dbus, fd); dbus->guid =l_strdup (guid); + dbus->transport =l_strdup (transport); classic->auth_command =l_strdup_printf ("AUTH EXTERNAL %s\r\n" , hexuid); classic->auth_state =WAITING_FOR_OK ; - dbus->negotiate_unix_fd = true; +if (!strcmp (transport,"unix" )) + dbus->negotiate_unix_fd = true; dbus->support_unix_fd = false;l_io_set_read_handler (dbus->io, auth_read_handler, dbus,NULL );
@@ -1145,7 +1154,81 @@ static struct l_dbus *setup_unix(char *params)return NULL ; } -return setup_dbus1 (fd, guid); +return setup_dbus1 (fd, guid,"unix" ); +} + +static struct l_dbus *setup_tcp (char *params) +{ +struct addrinfo hints; +struct addrinfo *results, *rp; +char *host =NULL , *port =NULL , *family =NULL , *guid =NULL ; +int port_number =-1 ; +int fd; + +while (params) { +char *key =strsep (¶ms,"," ); +char *value; + +if (!key) +break ; + + value =strchr (key,'=' ); +if (!value) +continue ; + + *value++ ='\0' ; + +if (!strcmp (key,"host" )) + host = value; +else if (!strcmp (key,"port" )) + port = value; +else if (!strcmp (key,"family" )) + family = value; +else if (!strcmp (key,"guid" )) + guid = value; + } + +if (!host || !port) +return NULL ; + + port_number =atoi (port); + +if (port_number <0 || port_number >=65536 ) +return NULL ; + +memset (&hints,0 ,sizeof (hints)); + +if (family !=NULL && !strcmp (family,"ipv4" )) + hints.ai_family =AF_INET ; +else if (family !=NULL && !strcmp (family,"ipv6" )) + hints.ai_family =AF_INET6 ; +else + hints.ai_family =AF_UNSPEC ; + + hints.ai_socktype =SOCK_STREAM ; + hints.ai_flags =0 ; + hints.ai_protocol =0 ; + +if (getaddrinfo (host, port, &hints, &results) !=0 ) +return NULL ; + +for (rp = results; rp !=NULL ; rp = rp->ai_next) { + fd =socket (rp->ai_family, rp->ai_socktype, rp->ai_protocol); +if (fd <0 ) +continue ; + +if (connect (fd, rp->ai_addr, rp->ai_addrlen) !=-1 ) +break ; + +close (fd); + } + +if (rp ==NULL ) +return NULL ; + +freeaddrinfo (results); + +return setup_dbus1 (fd, guid,"tcp" ); }static struct l_dbus *setup_address (const char *address)
@@ -1170,6 +1253,9 @@ static struct l_dbus *setup_address(const char *address)/* Function will modify params string */ dbus =setup_unix (params);break ; + }else if (!strcmp (transport,"tcp" )) { + dbus =setup_tcp (params); +break ; } }
@@ -1232,6 +1318,7 @@ LIB_EXPORT void l_dbus_destroy(struct l_dbus *dbus)l_free (dbus->guid);l_free (dbus->unique_name); +l_free (dbus->transport);_dbus_object_tree_free (dbus->tree);
Signature · 1 line
2.11.0
Re: [PATCH 1/2] dbus: Add support to tcp address
Hi Ramon,
Quoted 101 lines · Ramon Henrique
From: Ramon Ribeiro <[email protected]>
This patch allows a dbus client to connect to a dbus-daemon server address listenning a TCP transport protocol
--- ell/dbus.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 91 insertions(+), 4 deletions(-)ell/dbus.c +40
-4@@ -31,8 +31,10 @@#include <stdarg.h> #include <stdlib.h> #include <string.h> +#include <netdb.h> #include <sys/socket.h> #include <sys/un.h> +#include <netinet/in.h> #include <errno.h> #include "util.h" @@ -75,6 +77,7 @@ struct l_dbus_ops {struct l_dbus {struct l_io *io;char *guid; +char *transport;bool negotiate_unix_fd;bool support_unix_fd;bool is_ready;@@ -511,7 +514,10 @@ static bool auth_read_handler(struct l_io *io, void *user_data) }else if (!strncmp (ptr,"REJECTED " ,9 )) {static const char *command ="AUTH ANONYMOUS\r\n" ; - dbus->negotiate_unix_fd = true; +if (!strcmp (dbus->transport,"unix" )) + dbus->negotiate_unix_fd = true; +else + dbus->negotiate_unix_fd = false; classic->auth_command =l_strdup (command); classic->auth_state =WAITING_FOR_OK ;@@ -1033,7 +1039,8 @@ static const struct l_dbus_ops classic_ops = { .name_acquire = classic_name_acquire, }; -static struct l_dbus *setup_dbus1 (int fd,const char *guid) +static struct l_dbus *setup_dbus1 (int fd,const char *guid, +const char *transport) {static const unsigned char creds =0x00 ;char uid[6 ], hexuid[12 ], *ptr = hexuid;@@ -1065,11 +1072,13 @@ static struct l_dbus *setup_dbus1(int fd, const char *guid)dbus_init (dbus, fd); dbus->guid =l_strdup (guid); + dbus->transport =l_strdup (transport); classic->auth_command =l_strdup_printf ("AUTH EXTERNAL %s\r\n" , hexuid); classic->auth_state =WAITING_FOR_OK ; - dbus->negotiate_unix_fd = true; +if (!strcmp (transport,"unix" )) + dbus->negotiate_unix_fd = true; dbus->support_unix_fd = false;l_io_set_read_handler (dbus->io, auth_read_handler, dbus,NULL );@@ -1145,7 +1154,81 @@ static struct l_dbus *setup_unix(char *params)return NULL ; } -return setup_dbus1 (fd, guid); +return setup_dbus1 (fd, guid,"unix" ); +} + +static struct l_dbus *setup_tcp (char *params) +{ +struct addrinfo hints; +struct addrinfo *results, *rp; +char *host =NULL , *port =NULL , *family =NULL , *guid =NULL ; +int port_number =-1 ; +int fd; + +while (params) { +char *key =strsep (¶ms,"," ); +char *value; + +if (!key) +break ; + + value =strchr (key,'=' ); +if (!value) +continue ; + + *value++ ='\0' ; + +if (!strcmp (key,"host" )) + host = value; +else if (!strcmp (key,"port" )) + port = value;
ell/dbus.c static struct l_dbus *setup_unix(char *params) · line 1194
Quoted 10 lines
ell/dbus.c +10
-0+else if (!strcmp (key,"family" )) + family = value; +else if (!strcmp (key,"guid" )) + guid = value; + } + +if (!host || !port) +return NULL ; + + port_number =atoi (port);
So in general, the use of atoi is discouraged. Use strtoul or similar instead. You have much finer understanding / control of the error conditions with strtoul.
ell/dbus.c static struct l_dbus *setup_unix(char *params) · line 1197
Quoted 3 lines
ell/dbus.c +3
-0+ +if (port_number <0 || port_number >=65536 ) +return NULL ;
Hmm, according to D-Bus specification, port of zero is invalid (unless you're the server):
port (number) The tcp port the server will open. A zero value let the
server choose a free port provided from the underlaying operating system. libdbus is able to retrieve the real used port from the server.
Quoted 15 lines
ell/dbus.c +15
-0+ +memset (&hints,0 ,sizeof (hints)); + +if (family !=NULL && !strcmp (family,"ipv4" )) + hints.ai_family =AF_INET ; +else if (family !=NULL && !strcmp (family,"ipv6" )) + hints.ai_family =AF_INET6 ; +else + hints.ai_family =AF_UNSPEC ; + + hints.ai_socktype =SOCK_STREAM ; + hints.ai_flags =0 ; + hints.ai_protocol =0 ; + +if (getaddrinfo (host, port, &hints, &results) !=0 )
ell/dbus.c static struct l_dbus *setup_unix(char *params) · line 1222
Quoted 10 lines
ell/dbus.c +10
-0+return NULL ; + +for (rp = results; rp !=NULL ; rp = rp->ai_next) { + fd =socket (rp->ai_family, rp->ai_socktype, rp->ai_protocol); +if (fd <0 ) +continue ; + +if (connect (fd, rp->ai_addr, rp->ai_addrlen) !=-1 ) +break ; +
So you're using a blocking connect here that might take some time and are thus blocking the main event loop. You can get away with this with AF_UNIX since the connection is local and probably nearly instantaneous.
With TCP I'm not sure this is a good idea... Can we run the connect
loop in a non-blocking fashion?
Quoted 24 lines
ell/dbus.c +12
-0+close (fd); + } + +if (rp ==NULL ) +return NULL ; + +freeaddrinfo (results); + +return setup_dbus1 (fd, guid,"tcp" ); }static struct l_dbus *setup_address (const char *address)@@ -1170,6 +1253,9 @@ static struct l_dbus *setup_address(const char *address)/* Function will modify params string */ dbus =setup_unix (params);break ; + }else if (!strcmp (transport,"tcp" )) { + dbus =setup_tcp (params); +break ; } }
ell/dbus.c LIB_EXPORT void l_dbus_destroy(struct l_dbus *dbus) · line 1324
Quoted 7 lines
ell/dbus.c +1
-0@@ -1232,6 +1318,7 @@ LIB_EXPORT void l_dbus_destroy(struct l_dbus *dbus)l_free (dbus->guid);l_free (dbus->unique_name); +l_free (dbus->transport);_dbus_object_tree_free (dbus->tree);
Regards,
-Denis
PATCH 2/2 unit: dbus: Add unit test to dbus tcp address
In reply to Ramon HenriqueFrom: Ramon Ribeiro <[email protected]>
--- .gitignore | 1 + Makefile.am | 3 + unit/dbus.conf | 2 + unit/test-dbus-tcp.c | 261 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 267 insertions(+) create mode 100644 unit/test-dbus-tcp.c
.gitignore +1 -0
@@ -34,6 +34,7 @@ unit/test-netlink unit/test-genl unit/test-genl-msg unit/test-dbus +unit/test-dbus-tcp unit/test-dbus-message unit/test-dbus-message-fds unit/test-dbus-util
Makefile.am +3 -0
@@ -175,6 +175,7 @@ unit_tests = unit/test-unit \ dbus_tests = unit/test-hwdb \ unit/test-dbus \ + unit/test-dbus-tcp \ unit/test-dbus-util \ unit/test-dbus-message \ unit/test-dbus-message-fds \
@@ -243,6 +244,8 @@ unit_test_genl_msg_LDADD = ell/libell-private.la unit_test_dbus_LDADD = ell/libell-private.la +unit_test_dbus_tcp_LDADD = ell/libell-private.la + unit_test_dbus_message_LDADD = ell/libell-private.la unit_test_dbus_message_fds_LDADD = ell/libell-private.la
unit/dbus.conf +2 -0
@@ -7,6 +7,8 @@ <allow_anonymous /> <listen>unix:path=/tmp/ell-test-bus</listen> + <listen>tcp:host=localhost,bind=*,port=1234,family=ipv4</listen> + <apparmor mode="disabled" /> <policy context="default"> <!-- Allow everything to be sent -->
unit/test-dbus-tcp.c new file +261 -0
261 lines not on this page · raw message
Signature · 1 line
2.11.0
cover Allow connection to a tcp dbus address
In reply to Ramon HenriqueThis patch came from a demand in a project with industrial IoT for monitoring a PLC (creating supervisor apps). The infrastructure was built from a DBus service that can be accessed by a front-end in the same local network.
Changes from v0 to v1:
- Changes from atoi to strtoul
- Handle port of zero as invalid
- Use syscall select to avoid a blocking connect
Note: Maybe there is another approach using struct l_io and the callback l_io_write but I'm not sure if that is enough, due TCP connection timeout.
Ramon Ribeiro (2):
dbus: Add support to tcp address
unit: dbus: Add unit test to dbus tcp address
.gitignore | 1 + Makefile.am | 3 + ell/dbus.c | 151 ++++++++++++++++++++++++++++- unit/dbus.conf | 2 + unit/test-dbus-tcp.c | 261 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 413 insertions(+), 5 deletions(-) create mode 100644 unit/test-dbus-tcp.c
Signature · 1 line
2.7.4
PATCH 1/2 dbus: Add support to tcp address
This patch allows a dbus client to connect to a dbus-daemon server address listenning a TCP transport protocol.
A non-blocking TCP socket is created to avoid blocking the main event loop.
--- ell/dbus.c | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 146 insertions(+), 5 deletions(-)
ell/dbus.c +146 -5
@@ -31,8 +31,11 @@#include <stdarg.h> #include <stdlib.h> #include <string.h> +#include <netdb.h> #include <sys/socket.h> #include <sys/un.h> +#include <sys/select.h> +#include <netinet/in.h> #include <errno.h> #include "util.h"
@@ -75,6 +78,7 @@ struct l_dbus_ops {struct l_dbus {struct l_io *io;char *guid; +char *transport;bool negotiate_unix_fd;bool support_unix_fd;bool is_ready;
@@ -466,7 +470,8 @@ static bool auth_read_handler(struct l_io *io, void *user_data)return false;break ; - } + }else if (len ==0 ) +close (fd); offset += len; }
@@ -511,7 +516,10 @@ static bool auth_read_handler(struct l_io *io, void *user_data) }else if (!strncmp (ptr,"REJECTED " ,9 )) {static const char *command ="AUTH ANONYMOUS\r\n" ; - dbus->negotiate_unix_fd = true; +if (!strcmp (dbus->transport,"unix" )) + dbus->negotiate_unix_fd = true; +else + dbus->negotiate_unix_fd = false; classic->auth_command =l_strdup (command); classic->auth_state =WAITING_FOR_OK ;
@@ -680,6 +688,8 @@ static struct l_dbus_message *classic_recv_message(struct l_dbus *dbus) len =recv (fd, &hdr,DBUS_HEADER_SIZE ,MSG_PEEK |MSG_DONTWAIT );if (len !=DBUS_HEADER_SIZE )return NULL ; +else if (len ==0 ) +close (fd); header_size =align_len (DBUS_HEADER_SIZE + hdr.dbus1.field_length,8 ); header =l_malloc (header_size);
@@ -1033,7 +1043,8 @@ static const struct l_dbus_ops classic_ops = { .name_acquire = classic_name_acquire, }; -static struct l_dbus *setup_dbus1 (int fd,const char *guid) +static struct l_dbus *setup_dbus1 (int fd,const char *guid, +const char *transport) {static const unsigned char creds =0x00 ;char uid[6 ], hexuid[12 ], *ptr = hexuid;
@@ -1065,11 +1076,13 @@ static struct l_dbus *setup_dbus1(int fd, const char *guid)dbus_init (dbus, fd); dbus->guid =l_strdup (guid); + dbus->transport =l_strdup (transport); classic->auth_command =l_strdup_printf ("AUTH EXTERNAL %s\r\n" , hexuid); classic->auth_state =WAITING_FOR_OK ; - dbus->negotiate_unix_fd = true; +if (!strcmp (transport,"unix" )) + dbus->negotiate_unix_fd = true; dbus->support_unix_fd = false;l_io_set_read_handler (dbus->io, auth_read_handler, dbus,NULL );
@@ -1145,7 +1158,131 @@ static struct l_dbus *setup_unix(char *params)return NULL ; } -return setup_dbus1 (fd, guid); +return setup_dbus1 (fd, guid,"unix" ); +} + +static struct l_dbus *setup_tcp (char *params) +{ +struct addrinfo hints; +struct addrinfo *results, *rp; +fd_set rfds, wfds; +socklen_t optlen; +struct timeval tv; +char *host =NULL , *port =NULL , *family =NULL , *guid =NULL ; +unsigned long port_number; +int i, err; +int fd =-1 , socket_fd =-1 , optval =-1 ; + +while (params) { +char *key =strsep (¶ms,"," ); +char *value; + +if (!key) +break ; + + value =strchr (key,'=' ); +if (!value) +continue ; + + *value++ ='\0' ; + +if (!strcmp (key,"host" )) + host = value; +else if (!strcmp (key,"port" )) + port = value; +else if (!strcmp (key,"family" )) + family = value; +else if (!strcmp (key,"guid" )) + guid = value; + } + +if (!host || !port) +return NULL ; + + port_number =strtoul (port,NULL ,10 ); + +if (port_number ==0 || port_number >=65536 ) +return NULL ; + +memset (&hints,0 ,sizeof (hints)); + + hints.ai_family =AF_UNSPEC ; +if (family) { +if (!strcmp (family,"ipv4" )) + hints.ai_family =AF_INET ; +else if (!strcmp (family,"ipv6" )) + hints.ai_family =AF_INET6 ; + } + + hints.ai_socktype =SOCK_STREAM ; + hints.ai_flags =0 ; + hints.ai_protocol =0 ; + +if (getaddrinfo (host, port, &hints, &results) !=0 ) +return NULL ; + +FD_ZERO (&rfds); +FD_ZERO (&wfds); +for (rp = results; rp !=NULL ; rp = rp->ai_next) { + fd =socket (rp->ai_family, rp->ai_socktype |SOCK_NONBLOCK , rp->ai_protocol); +if (fd <0 ) +continue ; + + errno =0 ; +if (connect (fd, rp->ai_addr, rp->ai_addrlen) ==-1 ) { + err = errno; +if (err ==EINPROGRESS ) { +FD_SET (fd, &rfds); +FD_SET (fd, &wfds); + }else if (err ==ECONNREFUSED ){ +close (fd); + } + } + } + +freeaddrinfo (results); + + tv.tv_sec =1 ; + tv.tv_usec =0 ; + +// Wait until sockets be ready, otherwise a timeout is thrown +if (select (fd +1 , &rfds, &wfds,NULL , &tv) ==0 ) { +close (fd); +return NULL ; + } + +for (i =1 ; i < fd +1 ; i++) { +if (!FD_ISSET (i, &wfds) && !FD_ISSET (i, &rfds)) +continue ; + + optlen =sizeof (optval); + +if (getsockopt (i, +SOL_SOCKET ,SO_ERROR , &optval, + &optlen) ==-1 ) +return NULL ; + +/** +* getsockopt() puts the errno value +* for connect into optval so 0 means +* no-error. +*/ +if (optval ==0 ) { + socket_fd = i; + }else { +close (i); +return NULL ; + } + +/* Remove this socket from fd_set */ +FD_CLR (i, &wfds); +FD_CLR (i, &rfds); + } + +if (socket_fd <0 ) +return NULL ; + +return setup_dbus1 (socket_fd, guid,"tcp" ); }static struct l_dbus *setup_address (const char *address)
@@ -1170,6 +1307,9 @@ static struct l_dbus *setup_address(const char *address)/* Function will modify params string */ dbus =setup_unix (params);break ; + }else if (!strcmp (transport,"tcp" )) { + dbus =setup_tcp (params); +break ; } }
@@ -1232,6 +1372,7 @@ LIB_EXPORT void l_dbus_destroy(struct l_dbus *dbus)l_free (dbus->guid);l_free (dbus->unique_name); +l_free (dbus->transport);_dbus_object_tree_free (dbus->tree);
Signature · 1 line
2.7.4
Re: [PATCH v1 1/2] dbus: Add support to tcp address
Hi Ramon,
Quoted 8 lines · Ramon Ribeiro
This patch allows a dbus client to connect to a dbus-daemon server address listenning a TCP transport protocol.
A non-blocking TCP socket is created to avoid blocking the main event loop.--- ell/dbus.c | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 146 insertions(+), 5 deletions(-)
<snip>
ell/dbus.c static struct l_dbus *setup_unix(char *params) · line 1252
Quoted 9 lines
ell/dbus.c +9
-0+ + tv.tv_sec =1 ; + tv.tv_usec =0 ; + +// Wait until sockets be ready, otherwise a timeout is thrown +if (select (fd +1 , &rfds, &wfds,NULL , &tv) ==0 ) { +close (fd); +return NULL ; + }
How does this help? You're still sleeping in select and not allowing the main event loop to run. You would need to setup an l_io for these fds (so that they're part of the main-event loop epoll_wait call) and wait for the connect to succeed or go on to next address.
Regards,
-Denis
PATCH 2/2 unit: dbus: Add unit test to dbus tcp address
In reply to Ramon Ribeiro--- .gitignore | 1 + Makefile.am | 3 + unit/dbus.conf | 2 + unit/test-dbus-tcp.c | 261 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 267 insertions(+) create mode 100644 unit/test-dbus-tcp.c
.gitignore +1 -0
@@ -34,6 +34,7 @@ unit/test-netlink unit/test-genl unit/test-genl-msg unit/test-dbus +unit/test-dbus-tcp unit/test-dbus-message unit/test-dbus-message-fds unit/test-dbus-util
Makefile.am +3 -0
@@ -175,6 +175,7 @@ unit_tests = unit/test-unit \ dbus_tests = unit/test-hwdb \ unit/test-dbus \ + unit/test-dbus-tcp \ unit/test-dbus-util \ unit/test-dbus-message \ unit/test-dbus-message-fds \
@@ -243,6 +244,8 @@ unit_test_genl_msg_LDADD = ell/libell-private.la unit_test_dbus_LDADD = ell/libell-private.la +unit_test_dbus_tcp_LDADD = ell/libell-private.la + unit_test_dbus_message_LDADD = ell/libell-private.la unit_test_dbus_message_fds_LDADD = ell/libell-private.la
unit/dbus.conf +2 -0
@@ -7,6 +7,8 @@ <allow_anonymous /> <listen>unix:path=/tmp/ell-test-bus</listen> + <listen>tcp:host=localhost,bind=*,port=1234,family=ipv4</listen> + <apparmor mode="disabled" /> <policy context="default"> <!-- Allow everything to be sent -->
unit/test-dbus-tcp.c new file +261 -0
261 lines not on this page · raw message
Signature · 1 line
2.7.4
v2 cover Allow connection to a tcp dbus address
In reply to Ramon RibeiroChanges from v1 to v2:
- Use l_io instead of select, to avoid blocking main loop.
Indeed this approach of using select is not the best. Thanks for the review.
Ramon Ribeiro (2):
dbus: Add support to tcp address
unit: dbus: Add unit test to dbus tcp address
.gitignore | 1 + Makefile.am | 3 + ell/dbus.c | 125 +++++++++++++++++++++++- unit/dbus.conf | 2 + unit/test-dbus-tcp.c | 261 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 387 insertions(+), 5 deletions(-) create mode 100644 unit/test-dbus-tcp.c
Signature · 1 line
2.7.4
PATCH v2 1/2 dbus: Add support to tcp address
This patch allows a dbus client to connect to a dbus-daemon server address listenning a TCP transport protocol.
A non-blocking TCP socket is created to avoid blocking the main event loop.
--- ell/dbus.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 120 insertions(+), 5 deletions(-)
ell/dbus.c +120 -5
@@ -31,8 +31,10 @@#include <stdarg.h> #include <stdlib.h> #include <string.h> +#include <netdb.h> #include <sys/socket.h> #include <sys/un.h> +#include <netinet/in.h> #include <errno.h> #include "util.h"
@@ -43,6 +45,7 @@#include "dbus.h" #include "private.h" #include "dbus-private.h" +#include "main.h" #define DEFAULT_SYSTEM_BUS_ADDRESS "unix:path=/var/run/dbus/system_bus_socket"
@@ -75,6 +78,7 @@ struct l_dbus_ops {struct l_dbus {struct l_io *io;char *guid; +char *transport;bool negotiate_unix_fd;bool support_unix_fd;bool is_ready;
@@ -466,7 +470,8 @@ static bool auth_read_handler(struct l_io *io, void *user_data)return false;break ; - } + }else if (len ==0 ) +close (fd); offset += len; }
@@ -511,7 +516,10 @@ static bool auth_read_handler(struct l_io *io, void *user_data) }else if (!strncmp (ptr,"REJECTED " ,9 )) {static const char *command ="AUTH ANONYMOUS\r\n" ; - dbus->negotiate_unix_fd = true; +if (!strcmp (dbus->transport,"unix" )) + dbus->negotiate_unix_fd = true; +else + dbus->negotiate_unix_fd = false; classic->auth_command =l_strdup (command); classic->auth_state =WAITING_FOR_OK ;
@@ -680,6 +688,8 @@ static struct l_dbus_message *classic_recv_message(struct l_dbus *dbus) len =recv (fd, &hdr,DBUS_HEADER_SIZE ,MSG_PEEK |MSG_DONTWAIT );if (len !=DBUS_HEADER_SIZE )return NULL ; +else if (len ==0 ) +close (fd); header_size =align_len (DBUS_HEADER_SIZE + hdr.dbus1.field_length,8 ); header =l_malloc (header_size);
@@ -1033,7 +1043,8 @@ static const struct l_dbus_ops classic_ops = { .name_acquire = classic_name_acquire, }; -static struct l_dbus *setup_dbus1 (int fd,const char *guid) +static struct l_dbus *setup_dbus1 (int fd,const char *guid, +const char *transport) {static const unsigned char creds =0x00 ;char uid[6 ], hexuid[12 ], *ptr = hexuid;
@@ -1065,11 +1076,13 @@ static struct l_dbus *setup_dbus1(int fd, const char *guid)dbus_init (dbus, fd); dbus->guid =l_strdup (guid); + dbus->transport =l_strdup (transport); classic->auth_command =l_strdup_printf ("AUTH EXTERNAL %s\r\n" , hexuid); classic->auth_state =WAITING_FOR_OK ; - dbus->negotiate_unix_fd = true; +if (!strcmp (transport,"unix" )) + dbus->negotiate_unix_fd = true; dbus->support_unix_fd = false;l_io_set_read_handler (dbus->io, auth_read_handler, dbus,NULL );
@@ -1145,7 +1158,105 @@ static struct l_dbus *setup_unix(char *params)return NULL ; } -return setup_dbus1 (fd, guid); +return setup_dbus1 (fd, guid,"unix" ); +} + +static bool on_tcp_connected (struct l_io *io,void *user_data) +{ +bool *is_connected = user_data; + + *is_connected = true; + +return true; +} + +static struct l_dbus *setup_tcp (char *params) +{ +struct addrinfo hints; +struct addrinfo *results, *rp; +struct l_io *io_connect; +char *host =NULL , *port =NULL , *family =NULL , *guid =NULL ; +unsigned long port_number; +bool is_connected = false; +int err; +int fd =-1 ; + +while (params) { +char *key =strsep (¶ms,"," ); +char *value; + +if (!key) +break ; + + value =strchr (key,'=' ); +if (!value) +continue ; + + *value++ ='\0' ; + +if (!strcmp (key,"host" )) + host = value; +else if (!strcmp (key,"port" )) + port = value; +else if (!strcmp (key,"family" )) + family = value; +else if (!strcmp (key,"guid" )) + guid = value; + } + +if (!host || !port) +return NULL ; + + port_number =strtoul (port,NULL ,10 ); + +if (port_number ==0 || port_number >=65536 ) +return NULL ; + +memset (&hints,0 ,sizeof (hints)); + + hints.ai_family =AF_UNSPEC ; +if (family) { +if (!strcmp (family,"ipv4" )) + hints.ai_family =AF_INET ; +else if (!strcmp (family,"ipv6" )) + hints.ai_family =AF_INET6 ; + } + + hints.ai_socktype =SOCK_STREAM ; + hints.ai_flags =0 ; + hints.ai_protocol =0 ; + +if (getaddrinfo (host, port, &hints, &results) !=0 ) +return NULL ; + +for (rp = results, is_connected = false; + rp !=NULL && !is_connected; rp = rp->ai_next) { + fd =socket (rp->ai_family, rp->ai_socktype |SOCK_NONBLOCK , + rp->ai_protocol); +if (fd <0 ) +continue ; + +if (!connect (fd, rp->ai_addr, rp->ai_addrlen)) +break ; + + err = errno; + +if (err !=EINPROGRESS ) { +close (fd); +continue ; + } + + io_connect =l_io_new (fd); +l_io_set_write_handler (io_connect, + on_tcp_connected, &is_connected,NULL ); +l_main_iterate (1000 ); +if (is_connected) +l_io_destroy (io_connect); + } + +freeaddrinfo (results); + +return setup_dbus1 (fd, guid,"tcp" ); }static struct l_dbus *setup_address (const char *address)
@@ -1170,6 +1281,9 @@ static struct l_dbus *setup_address(const char *address)/* Function will modify params string */ dbus =setup_unix (params);break ; + }else if (!strcmp (transport,"tcp" )) { + dbus =setup_tcp (params); +break ; } }
@@ -1232,6 +1346,7 @@ LIB_EXPORT void l_dbus_destroy(struct l_dbus *dbus)l_free (dbus->guid);l_free (dbus->unique_name); +l_free (dbus->transport);_dbus_object_tree_free (dbus->tree);
Signature · 1 line
2.7.4
Re: [PATCH v2 1/2] dbus: Add support to tcp address
Hi Ramon,
Quoted 40 lines · Ramon Ribeiro
This patch allows a dbus client to connect to a dbus-daemon server address listenning a TCP transport protocol.
A non-blocking TCP socket is created to avoid blocking the main event loop.--- ell/dbus.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 120 insertions(+), 5 deletions(-)ell/dbus.c +4
-0@@ -31,8 +31,10 @@#include <stdarg.h> #include <stdlib.h> #include <string.h> +#include <netdb.h> #include <sys/socket.h> #include <sys/un.h> +#include <netinet/in.h> #include <errno.h> #include "util.h" @@ -43,6 +45,7 @@#include "dbus.h" #include "private.h" #include "dbus-private.h" +#include "main.h" #define DEFAULT_SYSTEM_BUS_ADDRESS "unix:path=/var/run/dbus/system_bus_socket"@@ -75,6 +78,7 @@ struct l_dbus_ops {struct l_dbus {struct l_io *io;char *guid; +char *transport;bool negotiate_unix_fd;bool support_unix_fd;bool is_ready;
ell/dbus.c static bool auth_read_handler(struct l_io *io, void *user_data) · line 475
Quoted 7 lines
ell/dbus.c +2
-1@@ -466,7 +470,8 @@ static bool auth_read_handler(struct l_io *io, void *user_data)return false;break ; - } + }else if (len ==0 ) +close (fd);
You still need to return false from the handler or tell l_io about the IO being closed some other way.
Quoted 15 lines
ell/dbus.c +4
-1offset += len; }@@ -511,7 +516,10 @@ static bool auth_read_handler(struct l_io *io, void *user_data) }else if (!strncmp (ptr,"REJECTED " ,9 )) {static const char *command ="AUTH ANONYMOUS\r\n" ; - dbus->negotiate_unix_fd = true; +if (!strcmp (dbus->transport,"unix" )) + dbus->negotiate_unix_fd = true; +else + dbus->negotiate_unix_fd = false; classic->auth_command =l_strdup (command); classic->auth_state =WAITING_FOR_OK ;
ell/dbus.c static struct l_dbus_message *classic_recv_message(struct l_dbus *dbus) · line 692
Quoted 5 lines
ell/dbus.c +2
-0@@ -680,6 +688,8 @@ static struct l_dbus_message *classic_recv_message(struct l_dbus *dbus) len =recv (fd, &hdr,DBUS_HEADER_SIZE ,MSG_PEEK |MSG_DONTWAIT );if (len !=DBUS_HEADER_SIZE )return NULL ; +else if (len ==0 ) +close (fd);
Aren't we returning NULL above if len != DBUS_HEADER_SIZE? So how is this check ever true?
Also, just closing the socket isn't really enough, you need to tell the io object that the channel is closed. E.g. by closing the fd and returning false from the read handler or by calling l_io_destroy.
Quoted 14 lines
ell/dbus.c +2
-1header_size =align_len (DBUS_HEADER_SIZE + hdr.dbus1.field_length,8 ); header =l_malloc (header_size);@@ -1033,7 +1043,8 @@ static const struct l_dbus_ops classic_ops = { .name_acquire = classic_name_acquire, }; -static struct l_dbus *setup_dbus1 (int fd,const char *guid) +static struct l_dbus *setup_dbus1 (int fd,const char *guid, +const char *transport) {static const unsigned char creds =0x00 ;char uid[6 ], hexuid[12 ], *ptr = hexuid;
ell/dbus.c static struct l_dbus *setup_dbus1(int fd, const char *guid) · line 1079
Quoted 4 lines
ell/dbus.c +1
-0@@ -1065,11 +1076,13 @@ static struct l_dbus *setup_dbus1(int fd, const char *guid)dbus_init (dbus, fd); dbus->guid =l_strdup (guid); + dbus->transport =l_strdup (transport);
Would a flag or an enum be enough?
Quoted 23 lines
ell/dbus.c +10
-2classic->auth_command =l_strdup_printf ("AUTH EXTERNAL %s\r\n" , hexuid); classic->auth_state =WAITING_FOR_OK ; - dbus->negotiate_unix_fd = true; +if (!strcmp (transport,"unix" )) + dbus->negotiate_unix_fd = true; dbus->support_unix_fd = false;l_io_set_read_handler (dbus->io, auth_read_handler, dbus,NULL );@@ -1145,7 +1158,105 @@ static struct l_dbus *setup_unix(char *params)return NULL ; } -return setup_dbus1 (fd, guid); +return setup_dbus1 (fd, guid,"unix" ); +} + +static bool on_tcp_connected (struct l_io *io,void *user_data) +{ +bool *is_connected = user_data; + + *is_connected = true;
ell/dbus.c static struct l_dbus *setup_unix(char *params) · line 1178
Quoted 10 lines
ell/dbus.c +10
-0+ +return true; +} + +static struct l_dbus *setup_tcp (char *params) +{ +struct addrinfo hints; +struct addrinfo *results, *rp; +struct l_io *io_connect; +char *host =NULL , *port =NULL , *family =NULL , *guid =NULL ;
So generally the Linux kernel coding style discourages such constructs. Each variable should be declared on a separate line.
Quoted 42 lines
ell/dbus.c +42
-0+unsigned long port_number; +bool is_connected = false; +int err; +int fd =-1 ; + +while (params) { +char *key =strsep (¶ms,"," ); +char *value; + +if (!key) +break ; + + value =strchr (key,'=' ); +if (!value) +continue ; + + *value++ ='\0' ; + +if (!strcmp (key,"host" )) + host = value; +else if (!strcmp (key,"port" )) + port = value; +else if (!strcmp (key,"family" )) + family = value; +else if (!strcmp (key,"guid" )) + guid = value; + } + +if (!host || !port) +return NULL ; + + port_number =strtoul (port,NULL ,10 ); + +if (port_number ==0 || port_number >=65536 ) +return NULL ; + +memset (&hints,0 ,sizeof (hints)); + + hints.ai_family =AF_UNSPEC ; +if (family) { +if (!strcmp (family,"ipv4" )) + hints.ai_family =AF_INET ;
ell/dbus.c static struct l_dbus *setup_unix(char *params) · line 1230
Quoted 10 lines
ell/dbus.c +10
-0+else if (!strcmp (family,"ipv6" )) + hints.ai_family =AF_INET6 ; + } + + hints.ai_socktype =SOCK_STREAM ; + hints.ai_flags =0 ; + hints.ai_protocol =0 ; + +if (getaddrinfo (host, port, &hints, &results) !=0 ) +return NULL ;
So are you intending to support hostname resolution here? Since you're not passing AI_NUMERICHOST or friends, I assume that you do. Again, this means that you're blocking the library.
Non-blocking address resolution is actually a huge pain. You can try to do threads, but since the rest of ell isn't thread safe, this is tricky.
The real solution is to port something like g_resolv from ConnMan to ell.
If you can live with only accepting IP addresses here, then that's what I would do first and live with the limitation until a non-blocking address resolution is added to ell.
Quoted 12 lines
ell/dbus.c +12
-0+ +for (rp = results, is_connected = false; + rp !=NULL && !is_connected; rp = rp->ai_next) { + fd =socket (rp->ai_family, rp->ai_socktype |SOCK_NONBLOCK , + rp->ai_protocol); +if (fd <0 ) +continue ; + +if (!connect (fd, rp->ai_addr, rp->ai_addrlen)) +break ; + + err = errno;
ell/dbus.c static struct l_dbus *setup_unix(char *params) · line 1252
Quoted 10 lines
ell/dbus.c +10
-0+ +if (err !=EINPROGRESS ) { +close (fd); +continue ; + } + + io_connect =l_io_new (fd); +l_io_set_write_handler (io_connect, + on_tcp_connected, &is_connected,NULL ); +l_main_iterate (1000 );
Yikes. Please don't do this, we don't do nested or re-entrant event loops and l_main_iterate is only meant to be used by integration with 3rd library event loops.
Quoted 22 lines
ell/dbus.c +10
-0+if (is_connected) +l_io_destroy (io_connect); + } + +freeaddrinfo (results); + +return setup_dbus1 (fd, guid,"tcp" ); }static struct l_dbus *setup_address (const char *address)@@ -1170,6 +1281,9 @@ static struct l_dbus *setup_address(const char *address)/* Function will modify params string */ dbus =setup_unix (params);break ; + }else if (!strcmp (transport,"tcp" )) { + dbus =setup_tcp (params); +break ; } }
ell/dbus.c LIB_EXPORT void l_dbus_destroy(struct l_dbus *dbus) · line 1352
Quoted 7 lines
ell/dbus.c +1
-0@@ -1232,6 +1346,7 @@ LIB_EXPORT void l_dbus_destroy(struct l_dbus *dbus)l_free (dbus->guid);l_free (dbus->unique_name); +l_free (dbus->transport);_dbus_object_tree_free (dbus->tree);
Regards,
-Denis
PATCH v2 2/2 unit: dbus: Add unit test to dbus tcp address
In reply to Ramon Ribeiro--- .gitignore | 1 + Makefile.am | 3 + unit/dbus.conf | 2 + unit/test-dbus-tcp.c | 261 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 267 insertions(+) create mode 100644 unit/test-dbus-tcp.c
.gitignore +1 -0
@@ -34,6 +34,7 @@ unit/test-netlink unit/test-genl unit/test-genl-msg unit/test-dbus +unit/test-dbus-tcp unit/test-dbus-message unit/test-dbus-message-fds unit/test-dbus-util
Makefile.am +3 -0
@@ -175,6 +175,7 @@ unit_tests = unit/test-unit \ dbus_tests = unit/test-hwdb \ unit/test-dbus \ + unit/test-dbus-tcp \ unit/test-dbus-util \ unit/test-dbus-message \ unit/test-dbus-message-fds \
@@ -243,6 +244,8 @@ unit_test_genl_msg_LDADD = ell/libell-private.la unit_test_dbus_LDADD = ell/libell-private.la +unit_test_dbus_tcp_LDADD = ell/libell-private.la + unit_test_dbus_message_LDADD = ell/libell-private.la unit_test_dbus_message_fds_LDADD = ell/libell-private.la
unit/dbus.conf +2 -0
@@ -7,6 +7,8 @@ <allow_anonymous /> <listen>unix:path=/tmp/ell-test-bus</listen> + <listen>tcp:host=localhost,bind=*,port=1234,family=ipv4</listen> + <apparmor mode="disabled" /> <policy context="default"> <!-- Allow everything to be sent -->
unit/test-dbus-tcp.c new file +261 -0
261 lines not on this page · raw message
Signature · 1 line
2.7.4