projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update snapshot(2018-01-04)
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
stack
/
include
/
internal
/
ocserverrequest.h
diff --git
a/resource/csdk/stack/include/internal/ocserverrequest.h
b/resource/csdk/stack/include/internal/ocserverrequest.h
index
ee48b7e
..
565c6e1
100644
(file)
--- a/
resource/csdk/stack/include/internal/ocserverrequest.h
+++ b/
resource/csdk/stack/include/internal/ocserverrequest.h
@@
-58,7
+58,6
@@
typedef struct OCServerRequest
OCQualityOfService qos;
/** Observe option field.*/
OCQualityOfService qos;
/** Observe option field.*/
-
uint32_t observationOption;
/** Observe Result field.*/
uint32_t observationOption;
/** Observe Result field.*/
@@
-73,6
+72,9
@@
typedef struct OCServerRequest
/** Remote endpoint address **/
OCDevAddr devAddr;
/** Remote endpoint address **/
OCDevAddr devAddr;
+ /** The ID of server request*/
+ uint32_t requestId;
+
/** Token for the request.*/
CAToken_t requestToken;
/** Token for the request.*/
CAToken_t requestToken;
@@
-89,7
+91,7
@@
typedef struct OCServerRequest
uint8_t numRcvdVendorSpecificHeaderOptions;
/** An Array of received vendor specific header options.*/
uint8_t numRcvdVendorSpecificHeaderOptions;
/** An Array of received vendor specific header options.*/
- OCHeaderOption
rcvdVendorSpecificHeaderOptions[MAX_HEADER_OPTIONS]
;
+ OCHeaderOption
*rcvdVendorSpecificHeaderOptions
;
/** Request to complete.*/
uint8_t requestComplete;
/** Request to complete.*/
uint8_t requestComplete;
@@
-175,7
+177,7
@@
OCServerRequest * GetServerRequestUsingToken (const CAToken_t token, uint8_t tok
* @return
* OCServerRequest*
*/
* @return
* OCServerRequest*
*/
-OCServerRequest * GetServerRequestUsingHandle (const OC
ServerRequest *
handle);
+OCServerRequest * GetServerRequestUsingHandle (const OC
RequestHandle
handle);
/**
* Get a server response from the server response list using the specified handle
/**
* Get a server response from the server response list using the specified handle
@@
-185,7
+187,7
@@
OCServerRequest * GetServerRequestUsingHandle (const OCServerRequest * handle);
* @return
* OCServerResponse*
*/
* @return
* OCServerResponse*
*/
-OCServerResponse * GetServerResponseUsingHandle (const OC
ServerRequest *
handle);
+OCServerResponse * GetServerResponseUsingHandle (const OC
RequestHandle
handle);
/**
* Add a server request to the server request list
/**
* Add a server request to the server request list
@@
-252,7
+254,8
@@
OCStackResult FormOCEntityHandlerRequest(
uint8_t numVendorOptions,
OCHeaderOption * vendorOptions,
OCObserveAction observeAction,
uint8_t numVendorOptions,
OCHeaderOption * vendorOptions,
OCObserveAction observeAction,
- OCObservationId observeID);
+ OCObservationId observeID,
+ uint16_t messageID);
/**
* Find a server request in the server request list and delete
/**
* Find a server request in the server request list and delete