x

contrib/examples/example_app/lwipopts.h

@@ -103,6 +103,8 @@
 #define TCP_FR_DEBUG               LWIP_DBG_OFF
 #define TCP_QLEN_DEBUG             LWIP_DBG_OFF
 #define TCP_RST_DEBUG              LWIP_DBG_OFF
+#define TAPIF_DEBUG                LWIP_DBG_ON
+#define MDNS_DEBUG                 LWIP_DBG_ON
 #endif
 
 #define LWIP_DBG_TYPES_ON         (LWIP_DBG_ON|LWIP_DBG_TRACE|LWIP_DBG_STATE|LWIP_DBG_FRESH|LWIP_DBG_HALT)

contrib/examples/mdns/mdns_example.c

@@ -36,9 +36,12 @@ srv_txt(struct mdns_service *service, void *txt_userdata)
 {
   err_t res;
   LWIP_UNUSED_ARG(txt_userdata);
-  
+
+  LWIP_DEBUGF(LWIP_DBG_ON, ("srv_txt called\n"));
   res = mdns_resp_add_service_txtitem(service, "path=/", 6);
   LWIP_ERROR("mdns add service txt failed\n", (res == ERR_OK), return);
+  res = mdns_resp_add_service_txtitem(service, "package_import_url=github://dlitz/esphome-configs-dlitz/mini.yaml@wip", 69);
+  LWIP_ERROR("mdns add big service txt failed\n", (res == ERR_OK), return);
 }
 #endif
 

doc/mdns.txt

@@ -92,9 +92,9 @@ If this call returns successfully, the following queries will be answered:
      LWIP_ERROR("mdns add service txt failed\n", (res == ERR_OK), return);
    }
 
-  Since a hostname struct is used for TXT storage each single item can be max
-  63 bytes long, and  the total max length (including length bytes for each
-  item) is 255 bytes.
+  Each item is encoded as a length byte followed by the data, so each single
+  item can be max 255 bytes long, and the total max length (including length
+  bytes for each item) is defined by MDNS_TXT_RDATA_MAXLEN (default 255).
 
 If your device runs a webserver on port 80, an example call might be:
 

src/apps/mdns/mdns.c

@@ -1272,7 +1272,7 @@ mdns_parse_pkt_known_answers(struct netif *netif, struct mdns_packet *pkt,
         } else if (match & REPLY_SERVICE_TXT) {
           mdns_prepare_txtdata(service);
           if (service->txtdata.length == ans.rd_length &&
-              pbuf_memcmp(pkt->pbuf, ans.rd_offset, service->txtdata.name, ans.rd_length) == 0) {
+              pbuf_memcmp(pkt->pbuf, ans.rd_offset, service->txtdata.rdata, ans.rd_length) == 0) {
             LWIP_DEBUGF(MDNS_DEBUG, ("MDNS: Skipping known answer: TXT\n"));
             reply->serv_replies[i] &= ~REPLY_SERVICE_TXT;
           }
@@ -2050,7 +2050,7 @@ mdns_handle_response(struct mdns_packet *pkt, struct netif *netif)
           } else if (ans.info.type == DNS_RRTYPE_TXT) {
             mdns_prepare_txtdata(service);
             if (service->txtdata.length == ans.rd_length &&
-                pbuf_memcmp(pkt->pbuf, ans.rd_offset, service->txtdata.name, ans.rd_length) == 0) {
+                pbuf_memcmp(pkt->pbuf, ans.rd_offset, service->txtdata.rdata, ans.rd_length) == 0) {
               LWIP_DEBUGF(MDNS_DEBUG, ("mDNS: response equals our own TXT record -> no conflict\n"));
               conflict = 0;
             }
@@ -2613,10 +2613,29 @@ mdns_resp_rename_service(struct netif *netif, u8_t slot, const char *name)
   return ERR_OK;
 }
 
+/* Adds an RFC 1035 character-string to TXT RDATA. */
+static err_t
+mdns_txt_add_charstr(struct mdns_txtdata *txtdata, const char *value, u8_t len)
+{
+  if (1 + len + txtdata->length > MDNS_TXT_RDATA_MAXLEN) {
+    LWIP_DEBUGF(MDNS_DEBUG, ("mdns_txt_add_charstr: adding string would exceed buffer (1+%d+%d > %d). Consider increasing MDNS_TXT_RDATA_MAXLEN.\n",
+                             len, txtdata->length, MDNS_TXT_RDATA_MAXLEN));
+    return ERR_MEM;
+  }
+  txtdata->rdata[txtdata->length] = len;
+  txtdata->length++;
+  if (len) {
+    MEMCPY(&txtdata->rdata[txtdata->length], value, len);
+    txtdata->length += len;
+  }
+  return ERR_OK;
+}
+
 /**
  * @ingroup mdns
  * Call this function from inside the service_get_txt_fn_t callback to add text data.
- * Buffer for TXT data is 256 bytes, and each field is prefixed with a length byte.
+ * Buffer for TXT data is MDNS_TXT_RDATA_MAXLEN (default 256) bytes, and each
+ * field is prefixed with a length byte.
  * @param service The service provided to the get_txt callback
  * @param txt String to add to the TXT field.
  * @param txt_len Length of string
@@ -2628,8 +2647,10 @@ mdns_resp_add_service_txtitem(struct mdns_service *service, const char *txt, u8_
   LWIP_ASSERT_CORE_LOCKED();
   LWIP_ASSERT("mdns_resp_add_service_txtitem: service != NULL", service);
 
+  LWIP_DEBUGF(MDNS_DEBUG, ("mDNS: adding txtitem: txt_len=%d, %02x %02x %02x %02x\n", txt_len, (int)txt[0], (int)txt[1], (int)txt[2], (int)txt[3]));  /*  DEBUG FIXME(dlitz)  */  
+
   /* Use a mdns_domain struct to store txt chunks since it is the same encoding */
-  return mdns_domain_add_label(&service->txtdata, txt, txt_len);
+  return mdns_txt_add_charstr(&service->txtdata, txt, txt_len);
 }
 
 #if LWIP_MDNS_SEARCH

src/apps/mdns/mdns_domain.c

@@ -55,7 +55,7 @@
 #define DOMAIN_JUMP_SIZE 2
 #define DOMAIN_JUMP 0xc000
 
-#define TOPDOMAIN_LOCAL "local"
+#define TOPDOMAIN_LOCAL "local2"
 
 #define REVERSE_PTR_TOPDOMAIN "arpa"
 #define REVERSE_PTR_V4_DOMAIN "in-addr"

src/apps/mdns/mdns_out.c

@@ -62,7 +62,7 @@ static void mdns_clear_outmsg(struct mdns_outmsg *outmsg);
 void
 mdns_prepare_txtdata(struct mdns_service *service)
 {
-  memset(&service->txtdata, 0, sizeof(struct mdns_domain));
+  memset(&service->txtdata, 0, sizeof(struct mdns_txtdata));
   if (service->txt_fn) {
     service->txt_fn(service, service->txt_userdata);
   }
@@ -508,7 +508,7 @@ mdns_add_txt_answer(struct mdns_outpacket *reply, struct mdns_outmsg *msg,
   }
   LWIP_DEBUGF(MDNS_DEBUG, ("MDNS: Responding with TXT record\n"));
   return mdns_add_answer(reply, &service_instance, DNS_RRTYPE_TXT, DNS_RRCLASS_IN,
-                         msg->cache_flush, ttl, (u8_t *) &service->txtdata.name,
+                         msg->cache_flush, ttl, service->txtdata.rdata,
                          service->txtdata.length, NULL);
 }
 

src/include/lwip/apps/mdns_opts.h

@@ -88,6 +88,12 @@
 #define MDNS_OUTPUT_PACKET_SIZE      ((MDNS_MAX_SERVICES == 1) ? 512 : 1450)
 #endif
 
+/** The maximum size of TXT RDATA allocated for each service record.
+ */
+#ifndef MDNS_TXT_RDATA_MAXLEN
+# define MDNS_TXT_RDATA_MAXLEN 256
+#endif
+
 /** MDNS_RESP_USENETIF_EXTCALLBACK==1: register an ext_callback on the netif
  * to automatically restart probing/announcing on status or address change.
  */

src/include/lwip/apps/mdns_priv.h

@@ -90,10 +90,16 @@ struct mdns_request {
 };
 #endif
 
+/** TXT record data */
+struct mdns_txtdata {
+  u8_t rdata[MDNS_TXT_RDATA_MAXLEN];
+  u16_t length;
+};
+
 /** Description of a service */
 struct mdns_service {
   /** TXT record to answer with */
-  struct mdns_domain txtdata;
+  struct mdns_txtdata txtdata;
   /** Name of service, like 'myweb' */
   char name[MDNS_LABEL_MAXLEN + 1];
   /** Type of service, like '_http' */
@@ -230,6 +236,12 @@ struct udp_pcb* get_mdns_pcb(void);
 
 #endif /* LWIP_MDNS_RESPONDER */
 
+char checker(int);
+char checkSizeOfInt[sizeof(struct mdns_service)]={checker(&checkSizeOfInt)};
+/*char checkSizeOfInt[sizeof(struct mdns_service_old)]={checker(&checkSizeOfInt)}; */
+char checkSizeOfInt[sizeof(struct mdns_domain)]={checker(&checkSizeOfInt)};
+char checkSizeOfInt[sizeof(struct mdns_txtdata)]={checker(&checkSizeOfInt)};
+
 #ifdef __cplusplus
 }
 #endif