Skip to content

fix constrained device provisioning issue #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2016
Merged

fix constrained device provisioning issue #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/device_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@

//! \{
#define MAX_STR_SIZE (64)
#define DEFAULT_PROVSIONING_TIMEOUT (30)
//! \}

/**
Expand Down Expand Up @@ -129,7 +130,7 @@ void GetClientList(json_object *respObj);
2 for ALREADY_PROVISIONED
*/
ProvisionStatus ProvisionConstrainedDevice(const char *clientID, const char *fcap,
const char *deviceType, int licenseeID, const char *parentID);
const char *deviceType, int licenseeID, const char *parentID, int timeout);

/**
* @brief Check if constrained device is provisioned or not
Expand Down
12 changes: 10 additions & 2 deletions src/device_manager_ubus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ enum {
ARG_CONSTRAINED_LICENSEE_ID,
ARG_CONSTRAINED_FCAP,
ARG_CONSTRAINED_PARENT_ID,
ARG_CONSTRAINED_TIMEOUT,
PROVISION_CONSTRAINED_DEVICE_MAX
};

Expand Down Expand Up @@ -112,7 +113,8 @@ static const struct blobmsg_policy
[ARG_CONSTRAINED_DEVICE_TYPE] = {.name = "device_type", .type = BLOBMSG_TYPE_STRING},
[ARG_CONSTRAINED_LICENSEE_ID] = {.name = "licensee_id", .type = BLOBMSG_TYPE_INT32},
[ARG_CONSTRAINED_FCAP] = {.name = "fcap", .type = BLOBMSG_TYPE_STRING},
[ARG_CONSTRAINED_PARENT_ID] = {.name = "parent_id", .type = BLOBMSG_TYPE_STRING}
[ARG_CONSTRAINED_PARENT_ID] = {.name = "parent_id", .type = BLOBMSG_TYPE_STRING},
[ARG_CONSTRAINED_TIMEOUT] = {.name = "timeout", .type = BLOBMSG_TYPE_INT32}
};

/** IsConstrainedDeviceProvisioned arguments and their type. */
Expand Down Expand Up @@ -245,6 +247,7 @@ static int ProvisionConstrainedDeviceHandler(struct ubus_context *ctx, struct ub
{
struct blob_attr *args[PROVISION_CONSTRAINED_DEVICE_MAX];
struct blob_buf b = {0};
int timeout;

blobmsg_parse(provisionConstrainedDevicePolicy, PROVISION_CONSTRAINED_DEVICE_MAX, args, blob_data(msg), blob_len(msg));
if (!args[ARG_CONSTRAINED_DEVICE_TYPE] || !args[ARG_CONSTRAINED_LICENSEE_ID] ||
Expand All @@ -258,10 +261,15 @@ static int ProvisionConstrainedDeviceHandler(struct ubus_context *ctx, struct ub
char *fcap = blobmsg_get_string(args[ARG_CONSTRAINED_FCAP]);
char *parentID = blobmsg_get_string(args[ARG_CONSTRAINED_PARENT_ID]);

if (!args[ARG_CONSTRAINED_TIMEOUT])
timeout = DEFAULT_PROVSIONING_TIMEOUT;
else
timeout = blobmsg_get_u32(args[ARG_CONSTRAINED_TIMEOUT]);

if (!deviceType || !clientID || !fcap || !parentID)
return UBUS_STATUS_UNKNOWN_ERROR;

ProvisionStatus status = ProvisionConstrainedDevice(clientID, fcap, deviceType, licenseeID, parentID);
ProvisionStatus status = ProvisionConstrainedDevice(clientID, fcap, deviceType, licenseeID, parentID, timeout);

blob_buf_init(&b, 0);
blobmsg_add_u32(&b, "status", status);
Expand Down
74 changes: 46 additions & 28 deletions src/fdm_provision_constrained.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@

#define COAP_TIMEOUT 10000

#define POLLING_TIMEOUT_SECONDS 30

#define POLLING_SLEEP_SECONDS 2

/***************************************************************************************************
Expand Down Expand Up @@ -512,22 +510,52 @@ static bool RemoveDeviceObservations(const char *clientID,
return result;
}

static bool WriteProvisioningInformationToDevice (const AwaServerSession *session,
const char *clientID, const char *fcapCode, const char *deviceType, int licenseeID,
const char *parentID)
static bool WriteParentID (const AwaServerSession *session, const char *clientID, const char *parentID)
{
bool result = false;
AwaError error = AwaError_Success;
unsigned char i, gatewayDeviceID[DEVICE_ID_SIZE];
AwaOpaque parentIDOpaque;

AwaError error = AwaError_Success;
bool result = false;
// 3 because two is for hex letters and one for space
if (strlen(parentID)/3 != DEVICE_ID_SIZE)
{
LOG(LOG_ERR, "ParentID is not of %u bytes", DEVICE_ID_SIZE);
return false;
}

AwaServerWriteOperation *writeOp = AwaServerWriteOperation_New(session, AwaWriteMode_Update);
if (writeOp != NULL)
{
for (i = 0; i < DEVICE_ID_SIZE; i++)
{
// 3 because two is for hex letters and one for space
sscanf(&parentID[i*3], "%02hhX", &gatewayDeviceID[i]);
}
parentIDOpaque.Data = gatewayDeviceID;
parentIDOpaque.Size = sizeof(gatewayDeviceID);
error = AwaServerWriteOperation_AddValueAsOpaque(writeOp, pathStore.parentIDPath, parentIDOpaque);
if (error == AwaError_Success)
{
error = AwaServerWriteOperation_Perform(writeOp, clientID, COAP_TIMEOUT);
if (error == AwaError_Success)
{
result = true;
}
else
{
LOG(LOG_ERR, "Failed to write parentID\nerror: %s", AwaError_ToString(error));
}
}
AwaServerWriteOperation_Free(&writeOp);
}
return result;
}

static bool WriteProvisioningInformationToDevice (const AwaServerSession *session,
const char *clientID, const char *fcapCode, const char *deviceType, int licenseeID)
{
bool result = false;
AwaError error = AwaError_Success;
AwaServerWriteOperation *writeOp = AwaServerWriteOperation_New(session, AwaWriteMode_Update);
if (writeOp != NULL)
{
Expand All @@ -546,38 +574,28 @@ static bool WriteProvisioningInformationToDevice (const AwaServerSession *sessio
error = AwaServerWriteOperation_AddValueAsInteger(writeOp, pathStore.licenseeIDPath, licenseeID);
}
if (error == AwaError_Success)
{
for (i = 0; i < DEVICE_ID_SIZE; i++)
{
// 3 because two is for hex letters and one for space
sscanf(&parentID[i*3], "%02hhX", &gatewayDeviceID[i]);
}
parentIDOpaque.Data = gatewayDeviceID;
parentIDOpaque.Size = sizeof(gatewayDeviceID);
error = AwaServerWriteOperation_AddValueAsOpaque(writeOp, pathStore.parentIDPath, parentIDOpaque);
}
if (error == AwaError_Success)
{
error = AwaServerWriteOperation_Perform(writeOp, clientID, COAP_TIMEOUT);
if (error == AwaError_Success)
{
result = true;
}
else
{
LOG(LOG_ERR, "Failed to perform write operation\nerror: %s", AwaError_ToString(error));
}
}
else
{
LOG(LOG_ERR, "Failed to create write request\nerror: %s",
AwaError_ToString(error));
LOG(LOG_ERR, "Failed to create write request\nerror: %s", AwaError_ToString(error));
}

AwaServerWriteOperation_Free(&writeOp);
}
return result;
}

static bool WaitForNotification(AwaServerSession *session)
static bool WaitForNotification(AwaServerSession *session, int timeout)
{
int timeout = POLLING_TIMEOUT_SECONDS;
while (timeout-- != 0)
{
AwaServerSession_Process(session, COAP_TIMEOUT);
Expand Down Expand Up @@ -613,13 +631,12 @@ bool IsConstrainedDeviceProvisioned(const char *clientID)
{
status = IsDeviceProvisioned(serverSession, clientID);
}

Server_ReleaseSession(&serverSession);
return status;
}

ProvisionStatus ProvisionConstrainedDevice(const char *clientID, const char*fcap,
const char *deviceType, int licenseeID, const char *parentID)
const char *deviceType, int licenseeID, const char *parentID, int timeout)
{
ProvisionStatus result = PROVISION_FAIL;
OBJECT_T flowObjects[] = {flowObject, flowAccessObject};
Expand Down Expand Up @@ -659,11 +676,12 @@ ProvisionStatus ProvisionConstrainedDevice(const char *clientID, const char*fcap

if (ObserveDeviceFlowAccessObject(serverSession, clientID, &flowAccessObjectChange, &flowAccessObjectChangeObservation))
{
if (!WriteProvisioningInformationToDevice(serverSession, clientID, fcap, deviceType, licenseeID, parentID))
if (!WriteProvisioningInformationToDevice(serverSession, clientID, fcap, deviceType, licenseeID) ||
!WriteParentID(serverSession, clientID, parentID))
{
LOG(LOG_ERR, "Writing of device provisioning information failed");
}
else if (WaitForNotification(serverSession))
else if (WaitForNotification(serverSession, timeout))
{
result = PROVISION_OK;
}
Expand Down
3 changes: 2 additions & 1 deletion src/fdm_provision_constrained.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,13 @@
* @param[in] deviceType registered device type
* @param[in] licenseeID Licensee ID.
* @param[in] parentID Device ID of Gateway device.
* @param[in] timeout time to wait for notification to arrive.
* @return 0 for PROVISION_OK
1 for PROVISION_FAIL
2 for ALREADY_PROVISIONED
*/
ProvisionStatus ProvisionConstrainedDevice(const char *clientID, const char *fcap,
const char *deviceType, int licenseeID, const char *parentID);
const char *deviceType, int licenseeID, const char *parentID, int timeout);

/**
* @brief Poll the contents of the FlowAccessObject of the constrained device.
Expand Down