diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-11-22 11:24:00 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-11-22 11:24:00 +0100 |
| commit | 078b1e581aba73f740c8e0d2e6faab963540aaab (patch) | |
| tree | a5e356536d590ab3dbf1ad626c49ca8712e6bc58 | |
| parent | 335c4ffd68329358b469fd119a058dd096abf1cb (diff) | |
| download | dabmux-078b1e581aba73f740c8e0d2e6faab963540aaab.tar.gz dabmux-078b1e581aba73f740c8e0d2e6faab963540aaab.tar.bz2 dabmux-078b1e581aba73f740c8e0d2e6faab963540aaab.zip | |
Prefer usage of ampersand in UDP output URL query
| -rw-r--r-- | doc/advanced.mux | 2 | ||||
| -rw-r--r-- | src/dabOutput/dabOutputUdp.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/advanced.mux b/doc/advanced.mux index 7714909..0db8c02 100644 --- a/doc/advanced.mux +++ b/doc/advanced.mux @@ -437,7 +437,7 @@ outputs { ; UDP send to host:port, simple example for unicast ;net_udp "udp://host:port" ; example with source and TTL specification for multicast - ;net_udp "udp://237.10.0.230:7000?src=10.0.1.125,ttl=1" + ;net_udp "udp://237.10.0.230:7000?src=10.0.1.125&ttl=1" ; RAW for farsync ETI card ;farsync "raw://sync0" diff --git a/src/dabOutput/dabOutputUdp.cpp b/src/dabOutput/dabOutputUdp.cpp index 9d3ea84..20e0c40 100644 --- a/src/dabOutput/dabOutputUdp.cpp +++ b/src/dabOutput/dabOutputUdp.cpp @@ -59,7 +59,7 @@ int DabOutputUdp::Open(const char* name) const string uri_without_proto(name); regex re_url("([^:]+):([0-9]+)(.*)"); - regex re_query("[?](?:src=([^,]+))(?:,ttl=([0-9]+))?"); + regex re_query("[?](?:src=([^&,]+))(?:[&,]ttl=([0-9]+))?"); smatch what; if (regex_match(uri_without_proto, what, re_url, match_default)) { string address = what[1]; @@ -118,7 +118,7 @@ int DabOutputUdp::Open(const char* name) else { etiLog.level(error) << uri_without_proto << " is an invalid format for UDP address: " - "expected ADDRESS:PORT[?src=SOURCE,ttl=TTL]"; + "expected ADDRESS:PORT[?src=SOURCE&ttl=TTL]"; return -1; } |