obgm/libcoap
2
0 Fork 0
mirror of https://github.com/obgm/libcoap.git synced 2026-11-05 17:32:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:obgm/libcoap into develop

Browse Source
This commit is contained in:
Olaf Bergmann committed 2020-06-03 09:48:17 +02:00
2 parents 2c7c35cf74 a178bd15d1
commit 617ac895ec
3 files changed
+7 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/coap2/pdu.h
+3
View File
@@ -208,6 +208,9 @@ const char *coap_response_phrase(unsigned char code);
#define COAP_MEDIATYPE_APPLICATION_SENML_XML 310 /* application/senml+xml */
#define COAP_MEDIATYPE_APPLICATION_SENSML_XML 311 /* application/sensml+xml */
/* Content formats from RFC 8782 */
#define COAP_MEDIATYPE_APPLICATION_DOTS_CBOR 271 /* application/dots+cbor */
/* Note that identifiers for registered media types are in the range 0-65535. We
* use an unallocated type here and hope for the best. */
#define COAP_MEDIATYPE_ANY 0xff /* any media type */
include/coap2/resource.h
+1 -1
View File
@@ -78,7 +78,7 @@ typedef struct coap_attr_t {
* https://tools.ietf.org/html/rfc7641#section-4.5
* but required by the DOTS signal channel protocol which needs to operate in
* lossy DDoS attack environments.
* https://tools.ietf.org/html/draft-ietf-dots-signal-channel-41#section-4.4.2.1
* https://tools.ietf.org/html/rfc8782#section-4.4.2.1
*/
#define COAP_RESOURCE_FLAGS_NOTIFY_NON_ALWAYS 0x4
src/coap_debug.c
+3
View File
@@ -398,9 +398,11 @@ print_content_format(unsigned int format_type,
{ COAP_MEDIATYPE_APPLICATION_LINK_FORMAT, "application/link-format" },
{ COAP_MEDIATYPE_APPLICATION_XML, "application/xml" },
{ COAP_MEDIATYPE_APPLICATION_OCTET_STREAM, "application/octet-stream" },
{ COAP_MEDIATYPE_APPLICATION_RDF_XML, "application/rdf+xml" },
{ COAP_MEDIATYPE_APPLICATION_EXI, "application/exi" },
{ COAP_MEDIATYPE_APPLICATION_JSON, "application/json" },
{ COAP_MEDIATYPE_APPLICATION_CBOR, "application/cbor" },
{ COAP_MEDIATYPE_APPLICATION_CWT, "application/cwt" },
{ COAP_MEDIATYPE_APPLICATION_COSE_SIGN, "application/cose; cose-type=\"cose-sign\"" },
{ COAP_MEDIATYPE_APPLICATION_COSE_SIGN1, "application/cose; cose-type=\"cose-sign1\"" },
{ COAP_MEDIATYPE_APPLICATION_COSE_ENCRYPT, "application/cose; cose-type=\"cose-encrypt\"" },
@@ -417,6 +419,7 @@ print_content_format(unsigned int format_type,
{ COAP_MEDIATYPE_APPLICATION_SENSML_EXI, "application/sensml-exi" },
{ COAP_MEDIATYPE_APPLICATION_SENML_XML, "application/senml+xml" },
{ COAP_MEDIATYPE_APPLICATION_SENSML_XML, "application/sensml+xml" },
{ COAP_MEDIATYPE_APPLICATION_DOTS_CBOR, "application/dots+cbor" },
{ 75, "application/dcaf+cbor" }
};