* Publish server info in mDNS in addition to sinks/sources

* Split off address parser * Add port= argument to module-zeroconf-publish git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@324 fefdeb5f-60dc-0310-8127-8f9354f1896f
2025-11-03 09:01:50 -05:00 · 2004-12-15 01:02:50 +00:00 · 2004-12-15 01:02:50 +00:00 · 99e0779b51
commit 99e0779b51
parent bc5b917f93
7 changed files with 242 additions and 94 deletions
--- a/polyp/parseaddr.c
+++ b/polyp/parseaddr.c
@ -0,0 +1,112 @@
+/* $Id$ */
+
+/***
+  This file is part of polypaudio.
+ 
+  polypaudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of the
+  License, or (at your option) any later version.
+ 
+  polypaudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public
+  License along with polypaudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+#include <assert.h>
+#include <stdlib.h>
+
+#include "xmalloc.h"
+#include "util.h"
+#include "parseaddr.h"
+
+/* Parse addresses in one of the following forms:
+ *    HOSTNAME
+ *    HOSTNAME:PORT
+ *    [HOSTNAME]
+ *    [HOSTNAME]:PORT
+ *
+ *  Return a newly allocated string of the hostname and fill in *ret_port if specified  */
+
+static char *parse_host(const char *s, uint16_t *ret_port) {
+    assert(s && ret_port);
+    if (*s == '[') {
+        char *e;
+        if (!(e = strchr(s+1, ']')))
+            return NULL;
+
+        if (e[1] == ':')
+            *ret_port = atoi(e+2);
+        else if (e[1] != 0)
+            return NULL;
+        
+        return pa_xstrndup(s+1, e-s-1);
+    } else {
+        char *e;
+        
+        if (!(e = strrchr(s, ':')))
+            return pa_xstrdup(s);
+
+        *ret_port = atoi(e+1);
+        return pa_xstrndup(s, e-s);
+    }
+}
+
+int pa_parse_address(const char *name, struct pa_parsed_address *ret_p) {
+    const char *p;
+    assert(name && ret_p);
+    memset(ret_p, 0, sizeof(struct pa_parsed_address));
+    ret_p->type = PA_PARSED_ADDRESS_TCP_AUTO;
+
+    if (*name == '{') {
+        char hn[256], *pfx;
+        /* The URL starts with a host specification for detecting local connections */
+        
+        if (!pa_get_host_name(hn, sizeof(hn)))
+            return -1;
+                
+        pfx = pa_sprintf_malloc("{%s}", hn);
+        if (!pa_startswith(name, pfx)) {
+            pa_xfree(pfx);
+            /* Not local */
+            return -1;
+        }
+        
+        p = name + strlen(pfx);
+        pa_xfree(pfx);
+    } else
+        p = name;
+    
+    if (*p == '/')
+        ret_p->type = PA_PARSED_ADDRESS_UNIX;
+    else if (pa_startswith(p, "unix:")) {
+        ret_p->type = PA_PARSED_ADDRESS_UNIX;
+        p += sizeof("unix:")-1;
+    } else if (pa_startswith(p, "tcp:") || pa_startswith(p, "tcp4:")) {
+        ret_p->type = PA_PARSED_ADDRESS_TCP4;
+        p += sizeof("tcp:")-1;
+    } else if (pa_startswith(p, "tcp6:")) {
+        ret_p->type = PA_PARSED_ADDRESS_TCP6;
+        p += sizeof("tcp6:")-1;
+    }
+
+    if (ret_p->type == PA_PARSED_ADDRESS_UNIX)
+        ret_p->path_or_host = pa_xstrdup(p);
+    else
+        if (!(ret_p->path_or_host = parse_host(p, &ret_p->port)))
+            return -1;
+    
+        
+    return 0;
+}