From cb507c2133bda61bee6c584912371b9e3aff0518 Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Tue, 21 Jul 2020 10:26:20 -0400 Subject: [PATCH] LP#1888406: Teach srfsh how to use the actual router name OpenSRF routers have a default XMPP user name of "router", but that can be changed. Unfortunately, srfsh doesn't know how to use the router name from the config when sending router-specific commands such as introspection calls. This commit allows that. Signed-off-by: Mike Rylander --- src/srfsh/srfsh.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/srfsh/srfsh.c b/src/srfsh/srfsh.c index 1887bac..2862610 100644 --- a/src/srfsh/srfsh.c +++ b/src/srfsh/srfsh.c @@ -956,10 +956,12 @@ static int router_query_servers( const char* router_server ) { if( ! router_server || strlen(router_server) == 0 ) return 0; - const static char router_text[] = "router@%s/router"; - size_t len = sizeof( router_text ) + strlen( router_server ) + 1; + char* router_name = osrfConfigGetValue(NULL, "/router_name"); + const static char router_text[] = "%s@%s/router"; + size_t len = sizeof( router_text ) + strlen( router_name ) + strlen( router_server ) + 1; char rbuf[len]; - snprintf(rbuf, sizeof(rbuf), router_text, router_server ); + snprintf(rbuf, sizeof(rbuf), router_text, router_name, router_server ); + free(router_name); transport_message* send = message_init( "servers", NULL, NULL, rbuf, NULL ); -- 2.11.0