Commit a2b88033 authored by Kishen Maloor's avatar Kishen Maloor

Merge branch 'origin/master' into ocfbridging

Signed-off-by: Kishen Maloor's avatarKishen Maloor <kishen.maloor@intel.com>
parents 2ee2d843 bb53715d
Pipeline #1023 passed with stage
in 10 minutes
......@@ -74,7 +74,7 @@ void
oc_send_response(oc_request_t *request, oc_status_t response_code)
{
#ifdef OC_SPEC_VER_OIC
if (request->origin->version == OIC_VER_1_1_0) {
if (request->origin && request->origin->version == OIC_VER_1_1_0) {
request->response->content_format = APPLICATION_CBOR;
} else
#endif /* OC_SPEC_VER_OIC */
......
......@@ -11,7 +11,7 @@ extern "C" {
typedef uint64_t oc_clock_time_t;
#define OC_CLOCK_CONF_TICKS_PER_SECOND CLOCKS_PER_SEC
#define OC_SPEC_VER_OIC
//#define OC_SPEC_VER_OIC
/* Security Layer */
/* Max inactivity timeout before tearing down DTLS connection */
#define OC_DTLS_INACTIVITY_TIMEOUT (600)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment