dname = optarg;
break;
case 'h':
- printf("%s [-D display] [-S server] [-O sink] [-I source] [-c file] [-d|-e|-i|-r]\n", pa_path_get_filename(argv[0]));
+ printf("%s [-D display] [-S server] [-O sink] [-I source] [-c file] [-d|-e|-i|-r]\n\n"
+ " -d Show current Polypaudio data attached to X11 display (default)\n"
+ " -e Export local Polypaudio data to X11 display\n"
+ " -i Import Polypaudio data from X11 display to local environment variables and cookie file.\n"
+ " -r Remove Polypaudio data from X11 display\n",
+ pa_path_get_filename(argv[0]));
ret = 0;
goto finish;
case 'd':
set_x11_prop(d, "POLYP_SERVER", c->default_server);
else {
char hn[256];
- pa_get_host_name(hn, sizeof(hn));
+ if (!pa_get_fqdn(hn, sizeof(hn))) {
+ fprintf(stderr, "Failed to get FQDN.\n");
+ goto finish;
+ }
+
set_x11_prop(d, "POLYP_SERVER", hn);
}
#include <limits.h>
#include <unistd.h>
#include <grp.h>
+#include <netdb.h>
#include <samplerate.h>
return j;
}
+
+char *pa_get_fqdn(char *s, size_t l) {
+ char hn[256];
+ struct addrinfo *a, hints;
+
+ if (!pa_get_host_name(hn, sizeof(hn)))
+ return NULL;
+
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_flags = AI_CANONNAME;
+
+ if (getaddrinfo(hn, NULL, &hints, &a) < 0 || !a || !a->ai_canonname || !*a->ai_canonname)
+ return pa_strlcpy(s, hn, l);
+
+ pa_strlcpy(s, a->ai_canonname, l);
+ freeaddrinfo(a);
+ return s;
+}
char *pa_get_user_name(char *s, size_t l);
char *pa_get_host_name(char *s, size_t l);
+char *pa_get_fqdn(char *s, size_t l);
char *pa_get_binary_name(char *s, size_t l);
char *pa_get_home_dir(char *s, size_t l);