CoAP - constrained application protocol

src/main.c

@@ -44,6 +44,7 @@
 #include "templ-payloads.h"     /* UDP packet payloads */
 #include "proto-snmp.h"         /* parse SNMP responses */
 #include "proto-ntp.h"          /* parse NTP responses */
+#include "proto-coap.h"         /* CoAP selftest */
 #include "templ-port.h"
 #include "in-binary.h"          /* covert binary output to XML/JSON */
 #include "main-globals.h"       /* all the global variables in the program */
@@ -1663,6 +1664,7 @@ int main(int argc, char *argv[])
          */
         {
             int x = 0;
+            x += proto_coap_selftest();
             x += smack_selftest();
             x += sctp_selftest();
             x += base64_selftest();

src/masscan-app.c

@@ -38,6 +38,7 @@ masscan_app_to_string(enum ApplicationProtocol proto)
     case PROTO_MEMCACHED: return "memcached";
     case PROTO_SCRIPTING:      return "scripting";
     case PROTO_VERSIONING:     return "versioning";
+    case PROTO_COAP:           return "coap";
 
     default:
         sprintf_s(tmp, sizeof(tmp), "(%u)", proto);
@@ -80,6 +81,7 @@ masscan_string_to_app(const char *str)
         {"memcached",   PROTO_MEMCACHED},
         {"scripting",   PROTO_SCRIPTING},
         {"versioning",  PROTO_VERSIONING},
+        {"coap",        PROTO_COAP},
         {0,0}
     };
     size_t i;

src/masscan-app.h

@@ -33,7 +33,7 @@ enum ApplicationProtocol {
     PROTO_MEMCACHED,
     PROTO_SCRIPTING,
     PROTO_VERSIONING,
-
+    PROTO_COAP,         /* constrained app proto, udp/5683, RFC7252 */
 
     PROTO_end_of_list /* must be last one */
 };

src/proto-banout.h

@@ -77,12 +77,17 @@ banout_append_unicode(struct BannerOutput *banout, unsigned proto, unsigned c);
 
 /**
  * Select a specific string (of the specified protocol).
+ * The "banner output" can have multiple protocol objects associated
+ * with it, such as an SSL protocol objec and an X.509 certificate.
+ * Thus, instead of just grabbing the string, we need to grab the
+ * specific protocol instead.
  */
 const unsigned char *
 banout_string(const struct BannerOutput *banout, unsigned proto);
 
 /**
  * Get the length of a specific string of the specified protocol.
+ * This is the matching function to banout_string.
  */
 unsigned
 banout_string_length(const struct BannerOutput *banout, unsigned proto);