// Refer http://www.gnu.org/software/libc/manual/html_node/BSD-Random.html
#define _DEFAULT_SOURCE
+#include "iotivity_config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#define TAG "OIC_CA_PRTCL_MSG"
-#define CA_BUFSIZE (128)
#define CA_PDU_MIN_SIZE (4)
#define CA_ENCODE_BUFFER_SIZE (4)
static const char COAP_URI_HEADER[] = "coap://[::]/";
+#ifdef WITH_CHPROXY
+static char g_chproxyUri[CA_MAX_URI_LENGTH];
+
+CAResult_t CASetProxyUri(const char *uri)
+{
+ VERIFY_NON_NULL(uri, TAG, "uri");
+ OICStrcpy(g_chproxyUri, sizeof (g_chproxyUri), uri);
+ return CA_STATUS_OK;
+}
+#endif
+
CAResult_t CAGetRequestInfoFromPDU(const coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
CARequestInfo_t *outReqInfo)
{
}
coap_pdu_t *CAGeneratePDU(uint32_t code, const CAInfo_t *info, const CAEndpoint_t *endpoint,
- coap_list_t **optlist, coap_transport_type *transport)
+ coap_list_t **optlist, coap_transport_t *transport)
{
VERIFY_NON_NULL_RET(info, TAG, "info", NULL);
VERIFY_NON_NULL_RET(endpoint, TAG, "endpoint", NULL);
VERIFY_NON_NULL_RET(optlist, TAG, "optlist", NULL);
+ OIC_LOG_V(DEBUG, TAG, "generate pdu for [%d]adapter, [%d]flags",
+ endpoint->adapter, endpoint->flags);
+
coap_pdu_t *pdu = NULL;
// RESET have to use only 4byte (empty message)
{
if (info->resourceUri)
{
+ OIC_LOG_V(DEBUG, TAG, "uri : %s", info->resourceUri);
+
uint32_t length = strlen(info->resourceUri);
if (CA_MAX_URI_LENGTH < length)
{
VERIFY_NON_NULL_RET(data, TAG, "data", NULL);
VERIFY_NON_NULL_RET(endpoint, TAG, "endpoint", NULL);
- coap_transport_type transport;
+ coap_transport_t transport = COAP_UDP;
#ifdef WITH_TCP
if (CAIsSupportedCoAPOverTCP(endpoint->adapter))
{
transport = coap_get_tcp_header_type_from_initbyte(((unsigned char *)data)[0] >> 4);
}
- else
#endif
- {
- transport = coap_udp;
- }
- coap_pdu_t *outpdu = coap_new_pdu(transport, length);
+ coap_pdu_t *outpdu = coap_new_pdu2(transport, length);
if (NULL == outpdu)
{
OIC_LOG(ERROR, TAG, "outpdu is null");
OIC_LOG_V(DEBUG, TAG, "pdu parse-transport type : %d", transport);
- int ret = coap_pdu_parse((unsigned char *) data, length, outpdu, transport);
+ int ret = coap_pdu_parse2((unsigned char *) data, length, outpdu, transport);
OIC_LOG_V(DEBUG, TAG, "pdu parse ret: %d", ret);
if (0 >= ret)
{
else
#endif
{
- if (outpdu->hdr->coap_hdr_udp_t.version != COAP_DEFAULT_VERSION)
+ if (outpdu->transport_hdr->udp.version != COAP_DEFAULT_VERSION)
{
OIC_LOG_V(ERROR, TAG, "coap version is not available : %d",
- outpdu->hdr->coap_hdr_udp_t.version);
+ outpdu->transport_hdr->udp.version);
goto exit;
}
- if (outpdu->hdr->coap_hdr_udp_t.token_length > CA_MAX_TOKEN_LEN)
+ if (outpdu->transport_hdr->udp.token_length > CA_MAX_TOKEN_LEN)
{
OIC_LOG_V(ERROR, TAG, "token length has been exceed : %d",
- outpdu->hdr->coap_hdr_udp_t.token_length);
+ outpdu->transport_hdr->udp.token_length);
goto exit;
}
}
return outpdu;
exit:
+ OIC_LOG(DEBUG, TAG, "data :");
+ OIC_LOG_BUFFER(DEBUG, TAG, (const uint8_t*) data, length);
coap_delete_pdu(outpdu);
return NULL;
}
coap_pdu_t *CAGeneratePDUImpl(code_t code, const CAInfo_t *info,
const CAEndpoint_t *endpoint, coap_list_t *options,
- coap_transport_type *transport)
+ coap_transport_t *transport)
{
VERIFY_NON_NULL_RET(info, TAG, "info", NULL);
VERIFY_NON_NULL_RET(endpoint, TAG, "endpoint", NULL);
else
#endif
{
- *transport = coap_udp;
+ *transport = COAP_UDP;
}
- coap_pdu_t *pdu = coap_new_pdu(*transport, length);
+ coap_pdu_t *pdu = coap_new_pdu2(*transport, length);
if (NULL == pdu)
{
#endif
{
OIC_LOG_V(DEBUG, TAG, "msgID is %d", info->messageId);
- uint16_t message_id;
+ uint16_t message_id = 0;
if (0 == info->messageId)
{
/* initialize message id */
/* use saved message id */
message_id = info->messageId;
}
- pdu->hdr->coap_hdr_udp_t.id = message_id;
- OIC_LOG_V(DEBUG, TAG, "messageId in pdu is %d, %d", message_id, pdu->hdr->coap_hdr_udp_t.id);
+ pdu->transport_hdr->udp.id = message_id;
+ OIC_LOG_V(DEBUG, TAG, "messageId in pdu is %d, %d", message_id, pdu->transport_hdr->udp.id);
- pdu->hdr->coap_hdr_udp_t.type = info->type;
+ pdu->transport_hdr->udp.type = info->type;
}
coap_add_code(pdu, *transport, code);
OIC_LOG_V(DEBUG, TAG, "token info token length: %d, token :", tokenLength);
OIC_LOG_BUFFER(DEBUG, TAG, (const uint8_t *)info->token, tokenLength);
- int32_t ret = coap_add_token(pdu, tokenLength, (unsigned char *)info->token, *transport);
+ int32_t ret = coap_add_token2(pdu, tokenLength, (unsigned char *)info->token, *transport);
if (0 == ret)
{
OIC_LOG(ERROR, TAG, "can't add token");
COAP_OPTION_DATA(*(coap_option *) opt->data));
OIC_LOG_V(DEBUG, TAG, "[%d] pdu length", pdu->length);
- coap_add_option(pdu, COAP_OPTION_KEY(*(coap_option *) opt->data),
- COAP_OPTION_LENGTH(*(coap_option *) opt->data),
- COAP_OPTION_DATA(*(coap_option *) opt->data), *transport);
+ coap_add_option2(pdu, COAP_OPTION_KEY(*(coap_option *) opt->data),
+ COAP_OPTION_LENGTH(*(coap_option *) opt->data),
+ COAP_OPTION_DATA(*(coap_option *) opt->data), *transport);
}
}
VERIFY_NON_NULL(uriInfo, TAG, "uriInfo");
VERIFY_NON_NULL(optlist, TAG, "optlist");
- OIC_LOG_V(DEBUG, TAG, "url : %s", uriInfo);
-
/* split arg into Uri-* options */
coap_uri_t uri;
coap_split_uri((unsigned char *) uriInfo, strlen(uriInfo), &uri);
}
else if (str && length)
{
- unsigned char uriBuffer[CA_BUFSIZE] = { 0 };
+ unsigned char uriBuffer[CA_MAX_URI_LENGTH] = { 0 };
unsigned char *pBuf = uriBuffer;
- size_t buflen = sizeof(uriBuffer);
- int res = (target == COAP_OPTION_URI_PATH) ? coap_split_path(str, length, pBuf, &buflen) :
- coap_split_query(str, length, pBuf, &buflen);
+ size_t unusedBufferSize = sizeof(uriBuffer);
+ int res = (target == COAP_OPTION_URI_PATH) ? coap_split_path(str, length, pBuf, &unusedBufferSize) :
+ coap_split_query(str, length, pBuf, &unusedBufferSize);
if (res > 0)
{
+ assert(unusedBufferSize < sizeof(uriBuffer));
+ size_t usedBufferSize = sizeof(uriBuffer) - unusedBufferSize;
size_t prevIdx = 0;
while (res--)
{
}
size_t optSize = COAP_OPT_SIZE(pBuf);
- if ((prevIdx + optSize) < buflen)
+ if (prevIdx + optSize > usedBufferSize)
{
- pBuf += optSize;
- prevIdx += optSize;
+ assert(false);
+ return CA_STATUS_INVALID_PARAM;
}
+ pBuf += optSize;
+ prevIdx += optSize;
}
}
else
}
else
{
- OIC_LOG_V(DEBUG, TAG, "Head opt ID: %d", id);
- OIC_LOG_V(DEBUG, TAG, "Head opt data: %s", (info->options + i)->optionData);
- OIC_LOG_V(DEBUG, TAG, "Head opt length: %d", (info->options + i)->optionLength);
+ OIC_LOG_V(DEBUG, TAG, "Head opt ID[%d], length[%d]", id, (info->options + i)->optionLength);
int ret = coap_insert(optlist,
CACreateNewOptionNode(id, (info->options + i)->optionLength,
(info->options + i)->optionData),
uint32_t CAGetOptionCount(coap_opt_iterator_t opt_iter)
{
uint32_t count = 0;
- coap_opt_t *option;
+ coap_opt_t *option = NULL;
while ((option = coap_option_next(&opt_iter)))
{
&& COAP_OPTION_BLOCK1 != opt_iter.type && COAP_OPTION_BLOCK2 != opt_iter.type
&& COAP_OPTION_SIZE1 != opt_iter.type && COAP_OPTION_SIZE2 != opt_iter.type
&& COAP_OPTION_CONTENT_FORMAT != opt_iter.type
- && COAP_OPTION_ACCEPT != opt_iter.type && COAP_OPTION_URI_PORT != opt_iter.type)
+ && COAP_OPTION_ACCEPT != opt_iter.type
+ && COAP_OPTION_URI_HOST != opt_iter.type && COAP_OPTION_URI_PORT != opt_iter.type
+ && COAP_OPTION_ETAG != opt_iter.type && COAP_OPTION_MAXAGE != opt_iter.type
+ && COAP_OPTION_PROXY_SCHEME != opt_iter.type)
{
count++;
}
VERIFY_NON_NULL(outCode, TAG, "outCode");
VERIFY_NON_NULL(outInfo, TAG, "outInfo");
- coap_transport_type transport;
+ coap_transport_t transport;
#ifdef WITH_TCP
if (CAIsSupportedCoAPOverTCP(endpoint->adapter))
{
- transport = coap_get_tcp_header_type_from_initbyte(((unsigned char *)pdu->hdr)[0] >> 4);
+ transport = coap_get_tcp_header_type_from_initbyte(((unsigned char *)pdu->transport_hdr)[0] >> 4);
}
else
#endif
{
- transport = coap_udp;
+ transport = COAP_UDP;
}
coap_opt_iterator_t opt_iter;
- coap_option_iterator_init((coap_pdu_t *) pdu, &opt_iter, COAP_OPT_ALL, transport);
+ coap_option_iterator_init2((coap_pdu_t *) pdu, &opt_iter, COAP_OPT_ALL, transport);
if (outCode)
{
#endif
{
// set type
- outInfo->type = pdu->hdr->coap_hdr_udp_t.type;
+ outInfo->type = pdu->transport_hdr->udp.type;
// set message id
- outInfo->messageId = pdu->hdr->coap_hdr_udp_t.id;
+ outInfo->messageId = pdu->transport_hdr->udp.id;
outInfo->payloadFormat = CA_FORMAT_UNDEFINED;
outInfo->acceptFormat = CA_FORMAT_UNDEFINED;
}
}
}
- coap_opt_t *option;
+ coap_opt_t *option = NULL;
char optionResult[CA_MAX_URI_LENGTH] = {0};
uint32_t idx = 0;
uint32_t optionLength = 0;
bool isfirstsetflag = false;
bool isQueryBeingProcessed = false;
+#ifdef WITH_CHPROXY
+ bool isProxyRequest = false;
+#endif
while ((option = coap_option_next(&opt_iter)))
{
OIC_LOG_V(DEBUG, TAG, "option[%d] has an unsupported format [%d]",
opt_iter.type, (uint8_t)buf[0]);
}
- else if (COAP_OPTION_URI_PORT == opt_iter.type)
+ else if (COAP_OPTION_URI_PORT == opt_iter.type ||
+ COAP_OPTION_URI_HOST == opt_iter.type ||
+ COAP_OPTION_ETAG == opt_iter.type ||
+ COAP_OPTION_MAXAGE == opt_iter.type ||
+ COAP_OPTION_PROXY_SCHEME== opt_iter.type)
{
OIC_LOG_V(INFO, TAG, "option[%d] has an unsupported format [%d]",
opt_iter.type, (uint8_t)buf[0]);
}
else
{
+#ifdef WITH_CHPROXY
+ if (COAP_OPTION_PROXY_URI == opt_iter.type)
+ {
+ isProxyRequest = true;
+ }
+#endif
if (idx < count)
{
if (bufLength <= sizeof(outInfo->options[0].optionData))
unsigned char* token = NULL;
unsigned int token_length = 0;
- coap_get_token(pdu->hdr, transport, &token, &token_length);
+ coap_get_token2(pdu->transport_hdr, transport, &token, &token_length);
// set token data
if (token_length > 0)
return CA_MEMORY_ALLOC_FAILED;
}
}
-
+#ifdef WITH_CHPROXY
+ else if(isProxyRequest && g_chproxyUri[0] != '\0')
+ {
+ /*
+ * A request for CoAP-HTTP Proxy will not have any uri element as per CoAP specs
+ * and only COAP_OPTION_PROXY_URI will be present. Use preset proxy uri
+ * for such requests.
+ */
+ outInfo->resourceUri = OICStrdup(g_chproxyUri);
+ if (!outInfo->resourceUri)
+ {
+ OIC_LOG(ERROR, TAG, "Out of memory");
+ OICFree(outInfo->options);
+ OICFree(outInfo->token);
+ return CA_MEMORY_ALLOC_FAILED;
+ }
+ }
+#endif
return CA_STATUS_OK;
exit:
return CA_STATUS_FAILED;
}
-CAResult_t CAGetTokenFromPDU(const coap_hdr_t *pdu_hdr, CAInfo_t *outInfo,
+CAResult_t CAGetTokenFromPDU(const coap_hdr_transport_t *pdu_hdr,
+ CAInfo_t *outInfo,
const CAEndpoint_t *endpoint)
{
VERIFY_NON_NULL(pdu_hdr, TAG, "pdu_hdr");
VERIFY_NON_NULL(outInfo, TAG, "outInfo");
VERIFY_NON_NULL(endpoint, TAG, "endpoint");
- coap_transport_type transport;
+ coap_transport_t transport = COAP_UDP;
#ifdef WITH_TCP
if (CAIsSupportedCoAPOverTCP(endpoint->adapter))
{
transport = coap_get_tcp_header_type_from_initbyte(((unsigned char *)pdu_hdr)[0] >> 4);
}
- else
#endif
- {
- transport = coap_udp;
- }
unsigned char* token = NULL;
unsigned int token_length = 0;
- coap_get_token(pdu_hdr, transport, &token, &token_length);
+ coap_get_token2(pdu_hdr, transport, &token, &token_length);
// set token data
- if (token_length > 0)
+ if (token && token_length > 0)
{
OIC_LOG_V(DEBUG, TAG, "token len:%d", token_length);
outInfo->token = (char *) OICMalloc(token_length);
// should remain that way so a 0 byte of length 1 is inserted.
len = 1;
option[0]=0;
- } else {
+ }
+ else
+ {
memcpy(option, data, len);
option[len] = '\0';
}
coap_hdr_t *hdr = (coap_hdr_t *) pdu;
- return (CAMessageType_t) hdr->coap_hdr_udp_t.type;
+ return (CAMessageType_t) hdr->type;
}
uint16_t CAGetMessageIdFromPduBinaryData(const void *pdu, uint32_t size)
coap_hdr_t *hdr = (coap_hdr_t *) pdu;
- return hdr->coap_hdr_udp_t.id;
+ return hdr->id;
}
CAResponseResult_t CAGetCodeFromPduBinaryData(const void *pdu, uint32_t size)
coap_hdr_t *hdr = (coap_hdr_t *) pdu;
- return (CAResponseResult_t) CA_RESPONSE_CODE(hdr->coap_hdr_udp_t.code);
+ return (CAResponseResult_t) CA_RESPONSE_CODE(hdr->code);
}
CAPayloadFormat_t CAConvertFormat(uint8_t format)
{
return true;
}
+ OIC_LOG_V(DEBUG, TAG, "adapter value of BWT is %d", adapter);
return false;
}
#endif
{
return true;
}
+ OIC_LOG_V(DEBUG, TAG, "adapter value of CoAP/TCP is %d", adapter);
return false;
}
#endif
projects / platform / upstream / iotivity.git / blobdiff