summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry HUCHARD <thierry@ordissimo.com>2020-02-09 18:24:31 +0100
committerThierry HUCHARD <thierry@ordissimo.com>2020-02-09 18:24:31 +0100
commit18ad41a53e1ecfa570849065e5f2cc617e7c09e7 (patch)
tree45321fb910f976a76feaa5e8aad6ea9178d91a7a
parent9ee4affdfc3b7f9534c6dc745398e2c2514ff56a (diff)
Fix null fields.
-rw-r--r--src/capabilities.c6
-rw-r--r--src/dnssd.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/src/capabilities.c b/src/capabilities.c
index ed20a1e..f6a4914 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -222,7 +222,11 @@ rennew:
// Parcours
parcours_prefixe(racine, afficher_noeud, scanner);
if (!scanner->duplex) scanner->duplex = strdup("F");
-
+
+ if (!scanner->adminurl) scanner->adminurl = strdup(name);
+ if (!scanner->uuid) scanner->uuid = strdup("T");
+ if (!scanner->representation) scanner->representation = strdup("T");
+
NOTE("txt = [\n\"representation=%s\"\n\"note=\"\n\"UUID=%s\"\n\"adminurl=%s\"\n\"duplex=%s\"\n\"is=%s\"\n\"cs=%s\"\n\"pdl=%s\"\n\"ty=%s\"\n\"rs=eSCL\"\n\"vers=%s\"\n\"txtvers=1\"\n]",
scanner->representation, scanner->uuid, scanner->adminurl, scanner->duplex, scanner->is, scanner->cs, scanner->pdl, scanner->ty, scanner->vers);
xmlFreeDoc(doc);
diff --git a/src/dnssd.c b/src/dnssd.c
index ee55def..16416a3 100644
--- a/src/dnssd.c
+++ b/src/dnssd.c
@@ -314,7 +314,11 @@ int dnssd_register(AvahiClient *c)
* Parse the device ID for MFG, MDL, and CMD
*/
+
dev_id = strdup(g_options.device_id);
+ NOTE("%s", "=======================================");
+ NOTE("%s", dev_id);
+ NOTE("%s", "=======================================");
if ((ptr = strcasestr(dev_id, "MFG:")) == NULL)
if ((ptr = strcasestr(dev_id, "MANUFACTURER:")) == NULL) {
ERR("No manufacturer info in device ID");