From 67bedf550b4943247c71d75b7fb2f317bba0debb Mon Sep 17 00:00:00 2001
From: Gabriel Schulhof <gabriel.schulhof@intel.com>
Date: Fri, 5 Jun 2015 15:55:31 +0300
Subject: [PATCH] All: Build against 809b1b1e9be15724a6d756b403328a95894e639f

---
 binding.gyp                  |  5 ++++-
 js/client.observe.js         |  2 +-
 js/server.observe.js         |  2 +-
 src/enums.cc                 | 11 +++++------
 tests/tests/simple-client.js |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/binding.gyp b/binding.gyp
index 099a98c1..2aafb62a 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -4,7 +4,10 @@
 			"<!(node -e \"require('nan')\")"
 		],
 		"libraries": [ '<!(pkg-config --libs octbstack)' ],
-		"cflags": [ '<!(pkg-config --cflags octbstack)' ]
+		"cflags": [
+			'<!(pkg-config --cflags octbstack)',
+			'-std=c++11'
+		]
 	},
 	"targets": [
 		{
diff --git a/js/client.observe.js b/js/client.observe.js
index bae6e715..fb5960aa 100644
--- a/js/client.observe.js
+++ b/js/client.observe.js
@@ -19,7 +19,7 @@ function getAbsoluteUrl( response ) {
 
 	return "coap://" +
 		ipv4Bytes[ 0 ] + "." + ipv4Bytes[ 1 ] + "." + ipv4Bytes[ 2 ] + "." + ipv4Bytes[ 3 ] + ":" +
-		portHolder.port + JSON.parse( response.resJSONPayload ).oc[ 0 ].href;
+		portHolder.port + JSON.parse( response.resJSONPayload ).oic[ 0 ].href;
 }
 
 iotivity.OCInit( null, 0, iotivity.OCMode.OC_CLIENT );
diff --git a/js/server.observe.js b/js/server.observe.js
index c4843202..b306ca09 100644
--- a/js/server.observe.js
+++ b/js/server.observe.js
@@ -32,7 +32,7 @@ iotivity.OCCreateResource(
 				}
 			} );
 
-		console.log( "OCCreateResource() handler: Entering" );
+		console.log( "OCCreateResource() handler: Responding with " + payload );
 		iotivity.OCDoResponse( {
 			requestHandle: request.requestHandle.handle,
 			resourceHandle: request.resource.handle,
diff --git a/src/enums.cc b/src/enums.cc
index 0528b6c5..1e287f01 100644
--- a/src/enums.cc
+++ b/src/enums.cc
@@ -10,9 +10,6 @@ using namespace v8;
 static Local<Object> bind_OCEntityHandlerFlag() {
   Local<Object> returnValue = NanNew<Object>();
 
-  returnValue->ForceSet(NanNew<String>("OC_INIT_FLAG"),
-                        NanNew<Number>(OC_INIT_FLAG),
-                        static_cast<PropertyAttribute>(ReadOnly || DontDelete));
   returnValue->ForceSet(NanNew<String>("OC_REQUEST_FLAG"),
                         NanNew<Number>(OC_REQUEST_FLAG),
                         static_cast<PropertyAttribute>(ReadOnly || DontDelete));
@@ -43,6 +40,9 @@ static Local<Object> bind_OCEntityHandlerResult() {
   returnValue->ForceSet(NanNew<String>("OC_EH_FORBIDDEN"),
                         NanNew<Number>(OC_EH_FORBIDDEN),
                         static_cast<PropertyAttribute>(ReadOnly || DontDelete));
+  returnValue->ForceSet(NanNew<String>("OC_EH_RESOURCE_NOT_FOUND"),
+                        NanNew<Number>(OC_EH_RESOURCE_NOT_FOUND),
+                        static_cast<PropertyAttribute>(ReadOnly || DontDelete));
 
   return returnValue;
 }
@@ -296,10 +296,9 @@ static Local<Object> bind_OCVirtualResources() {
 static Local<Object> bind_OCConnectivityType() {
   Local<Object> returnValue = NanNew<Object>();
 
-  returnValue->ForceSet(NanNew<String>("OC_ETHERNET"),
-                        NanNew<Number>(OC_ETHERNET),
+  returnValue->ForceSet(NanNew<String>("OC_IPV4"), NanNew<Number>(OC_IPV4),
                         static_cast<PropertyAttribute>(ReadOnly || DontDelete));
-  returnValue->ForceSet(NanNew<String>("OC_WIFI"), NanNew<Number>(OC_WIFI),
+  returnValue->ForceSet(NanNew<String>("OC_IPV6"), NanNew<Number>(OC_IPV6),
                         static_cast<PropertyAttribute>(ReadOnly || DontDelete));
   returnValue->ForceSet(NanNew<String>("OC_EDR"), NanNew<Number>(OC_EDR),
                         static_cast<PropertyAttribute>(ReadOnly || DontDelete));
diff --git a/tests/tests/simple-client.js b/tests/tests/simple-client.js
index 913b474f..4d81c7cc 100644
--- a/tests/tests/simple-client.js
+++ b/tests/tests/simple-client.js
@@ -124,7 +124,7 @@ test( "Simple client", function( assert ) {
 
 									// Make sure the callback was called with the right response
 									assert.deepEqual(
-										JSON.parse( response.resJSONPayload ).oc[ 0 ],
+										JSON.parse( response.resJSONPayload ).oic[ 0 ],
 										magicToken,
 										"OCDoResource observation handler has received the " +
 											"expected response" );