RDKB-60325 : notify_tunnel_status failure in hotspot #5
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /* | ||
| * If not stated otherwise in this file or this component's Licenses.txt file the | ||
|
Check failure on line 2 in source/hotspotfd/hotspotfd.c
|
||
| * following copyright and licenses apply: | ||
| * | ||
| * Copyright 2015 RDK Management | ||
|
|
@@ -195,6 +195,8 @@ | |
|
|
||
| STATIC pthread_t dhcp_snooper_tid; | ||
|
|
||
| char TunnelStatus[8] = {0}; | ||
|
|
||
| int gSnoopNumberOfClients = 0; //shared variable across hotspotfd and dhcp_snooperd | ||
|
|
||
| bool gSnoopEnable = true; | ||
|
|
@@ -308,84 +310,92 @@ | |
| return HOTSPOTFD_ERROR; | ||
| } | ||
|
|
||
| STATIC void notify_tunnel_status(char *status) | ||
| { | ||
| rbusEvent_t event; | ||
| rbusObject_t data; | ||
| rbusValue_t value; | ||
| rbusError_t ret; | ||
|
|
||
| strncpy(TunnelStatus, status, sizeof(TunnelStatus) - 1); | ||
| TunnelStatus[sizeof(TunnelStatus) - 1] = '\0'; | ||
| CcspTraceInfo(("%s:%d : TunnelStatus set to %s\n", __FUNCTION__, __LINE__, TunnelStatus)); | ||
|
|
||
| rbusValue_Init(&value); | ||
| rbusValue_SetString(value, status); | ||
| rbusObject_Init(&data, NULL); | ||
| rbusObject_SetValue(data, "TunnelStatus", value); | ||
|
|
||
| event.name = "Device.X_COMCAST-COM_GRE.Tunnel.1.TunnelStatus"; | ||
| event.type = RBUS_EVENT_GENERAL; | ||
| event.data = data; | ||
|
|
||
| ret = rbusEvent_Publish(handle, &event); | ||
|
|
||
| if(ret != RBUS_ERROR_SUCCESS) { | ||
| CcspTraceError(("%s:%d : rbusEvent_Publish failed: %d\n", __FUNCTION__, __LINE__, ret)); | ||
| } | ||
| else { | ||
| CcspTraceInfo(("%s:%d : rbusEvent_Publish success\n", __FUNCTION__, __LINE__)); | ||
| } | ||
|
|
||
| rbusValue_Release(value); | ||
| rbusObject_Release(data); | ||
|
|
||
| if(strcmp("Down",status) == 0) | ||
| { | ||
| gVapIsUp = false; | ||
| } | ||
| else if(strcmp("Up",status) == 0) | ||
| { | ||
| gVapIsUp = true; | ||
| } | ||
| } | ||
|
|
||
| rbusError_t TunnelStatus_GetStringHandler(rbusHandle_t handle, rbusProperty_t property, rbusGetHandlerOptions_t* opts) | ||
| { | ||
| (void)handle; | ||
| (void)opts; | ||
|
|
||
| //set value | ||
| rbusValue_t val; | ||
| rbusValue_Init(&val); | ||
| rbusValue_SetString(val, TunnelStatus); | ||
| rbusProperty_SetValue(property, val); | ||
| rbusValue_Release(val); | ||
|
|
||
| return RBUS_ERROR_SUCCESS; | ||
| } | ||
|
|
||
| rbusError_t TunnelStatus_SetStringHandler(rbusHandle_t handle, rbusProperty_t property, rbusSetHandlerOptions_t* opts) | ||
| { | ||
| (void)handle; | ||
| (void)opts; | ||
|
|
||
| int ret = RBUS_ERROR_SUCCESS; | ||
|
|
||
| rbusValue_t value = rbusProperty_GetValue(property); | ||
| const char* newStatus = rbusValue_GetString(value, NULL); | ||
|
|
||
| if(newStatus && (strcmp(newStatus, "Up") == 0 || strcmp(newStatus, "Down") == 0)) | ||
| { | ||
| if(strcmp(TunnelStatus, newStatus) != 0){ | ||
|
|
||
| CcspTraceInfo(("%s:%d : Calling notify_tunnel_status with %s\n", __FUNCTION__, __LINE__, newStatus)); | ||
|
|
||
| notify_tunnel_status((char *)newStatus); | ||
| } | ||
| else{ | ||
| CcspTraceInfo(("%s:%d : TunnelStatus is already %s, no change\n", __FUNCTION__, __LINE__, TunnelStatus)); | ||
| } | ||
| } | ||
| else | ||
| { | ||
| CcspTraceError(("%s:%d : Invalid TunnelStatus value: %s\n", __FUNCTION__, __LINE__, newStatus ? newStatus : "NULL")); | ||
| ret = RBUS_ERROR_INVALID_INPUT; | ||
| } | ||
|
|
||
| return ret; | ||
| } | ||
|
|
||
| STATIC bool set_validatessid() { | ||
|
|
@@ -2046,17 +2056,27 @@ | |
| hotspotfd_log(); | ||
|
|
||
| #ifdef WAN_FAILOVER_SUPPORTED | ||
| rbusDataElement_t dataElements[1] = { | ||
| {"Device.X_COMCAST-COM_GRE.Tunnel.1.TunnelStatus", RBUS_ELEMENT_TYPE_EVENT | RBUS_ELEMENT_TYPE_PROPERTY, {TunnelStatus_GetStringHandler, TunnelStatus_SetStringHandler, NULL, NULL, NULL, NULL}} | ||
|
Contributor
There was a problem hiding this comment. Can you please confirm, rbus is not polling for ValueChange when someone subscribes for this parameter. since we have explicit publish this may not be needed. Otherwise we may need to have explicit subscribe handler with autoPublish setting to false
Contributor
There was a problem hiding this comment. This code change is expected to address the issue - 4684824 A separate subscribe handler with |
||
| }; | ||
| ret = rbus_open(&handle, "HotspotTunnelEvent"); | ||
| if(ret != RBUS_ERROR_SUCCESS) | ||
| { | ||
| CcspTraceError(("HotspotTunnelEvent : rbus_open failed: %d\n", ret)); | ||
| return; | ||
| } | ||
| ret = rbus_regDataElements(handle, 1, dataElements); | ||
| if(ret != RBUS_ERROR_SUCCESS) | ||
| { | ||
| CcspTraceError(("Device.X_COMCAST-COM_GRE.Tunnel.1.TunnelStatus rbus_regDataElements failed: %d\n", ret)); | ||
| return; | ||
| } | ||
| else{ | ||
| CcspTraceInfo(("Device.X_COMCAST-COM_GRE.Tunnel.1.TunnelStatus is registered in rbus")); | ||
| } | ||
| pthread_create(&rbus_tid, NULL, handle_rbusSubscribe, NULL); | ||
|
|
||
| #endif | ||
| if (sysevent_set(sysevent_fd_gs, sysevent_token_gs, kHotspotfd_tunnelEP, kDefault_DummyEP, 0)) | ||
| { | ||
| CcspTraceError(("sysevent set %s failed for %s\n", kHotspotfd_tunnelEP, kDefault_DummyEP)); | ||
|
|
@@ -2406,4 +2426,4 @@ | |
| } | ||
|
|
||
| goto keep_it_alive; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Device.X_COMCAST-COM_GRE.Tunnel.1.TunnelStatus , since it is under WAN_FAILOVER_SUPPORTED, hotspot behavior during down/up will break in CBR which doesn't have this CFLAG
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This code change is expected to address the issue - 7176717
With code change ensured the Gerrit verification build passed for all devices - https://gerrit.teamccp.com/#/c/943504/