rmnetctl: Remove rmnet_data.h header include
Remove all legacy code related to older rmnet_data driver.
Change-Id: Iebb7bb90e3e54663882d5f374957af48b373fa9d
diff --git a/rmnetctl/cli/rmnetcli.c b/rmnetctl/cli/rmnetcli.c
index 128ad36..9373aee 100644
--- a/rmnetctl/cli/rmnetcli.c
+++ b/rmnetctl/cli/rmnetcli.c
@@ -60,7 +60,7 @@
#define _RMNETCLI_CHECKNULL(X) do { if (!X) { \
print_rmnet_api_status(RMNETCTL_INVALID_ARG, RMNETCTL_CFG_FAILURE_NO_COMMAND); \
- rmnetctl_cleanup(handle); \
+ rtrmnet_ctl_deinit(handle); \
return RMNETCTL_INVALID_ARG; \
} } while (0);
#define _STRTOUI32(X) (uint32_t)strtoul(X, NULL, 0)
@@ -92,138 +92,22 @@
printf("RmNet API Usage:\n\n");
printf("rmnetcli help Displays this help\n");
printf("\n");
- printf("rmnetcli assocnetdev <dev_name> Registers the RmNet");
- printf(_5TABS" data driver on a particular");
- printf(_5TABS" device.dev_name cannot");
- printf(_5TABS" be larger than 15");
- printf(_5TABS" characters. Returns");
- printf(_5TABS" the status code.\n\n");
- printf("rmnetcli unassocnetdev <dev_name> Unregisters the");
- printf(_5TABS" RmNet data driver on a particular");
- printf(_5TABS" device. dev_name cannot");
- printf(_5TABS" be larger than 15");
- printf(_5TABS" characters. Returns");
- printf(_5TABS" the status code.\n\n");
- printf("rmnetcli getnetdevassoc <dev_name> Get if the RmNet");
- printf(_5TABS" data driver is registered on");
- printf(_5TABS" a particular device.");
- printf(_5TABS" dev_name cannot be");
- printf(_5TABS" larger than 15");
- printf(_5TABS" characters. Returns 1");
- printf(_5TABS" if is registered and");
- printf(_5TABS" 0 if it is not");
- printf(_5TABS" registered\n\n");
- printf("rmnetcli setledf <egress_flags> Sets the egress data");
- printf(_2TABS" <agg_size> format for a particular link.");
- printf(_2TABS" <agg_count> dev_name cannot be larger");
- printf(_2TABS" <dev_name> than 15 characters.");
- printf(_5TABS" Returns the status code\n\n");
- printf("rmnetcli getledf <dev_name> Gets the egress data");
- printf(_5TABS" format for a particular link.");
- printf(_5TABS" dev_name cannot be larger");
- printf(_5TABS" than 15. Returns the 4");
- printf(_5TABS" byte unsigned integer");
- printf(_5TABS" egress_flags\n\n");
- printf("rmnetcli setlidf <ingress_flags> Sets the ingress");
- printf(_2TABS" <tail_spacing> data format for a particular");
- printf(_2TABS" <dev_name> link. ingress_flags is 4");
- printf(_5TABS" byte unsigned integer.");
- printf(_5TABS" tail_spacing is a one.");
- printf(_5TABS" byte unsigned integer.");
- printf(_5TABS" dev_name cannot be");
- printf(_5TABS" larger than 15.");
- printf(_5TABS" characters. Returns");
- printf(_5TABS" the status code\n\n");
- printf("rmnetcli getlidf <dev_name> Gets the ingress");
- printf(_5TABS" data format for a particular");
- printf(_5TABS" link. dev_name cannot be");
- printf(_5TABS" larger than 15. Returns");
- printf(_5TABS" the 4 byte unsigned");
- printf(_5TABS" integer ingress_flags\n\n");
- printf("rmnetcli setlepc <logical_ep_id> Sets the logical");
- printf(_2TABS" <rmnet_mode> endpoint configuration for");
- printf(_2TABS" <dev_name> a particular link.");
- printf(_2TABS" <egress_dev_name> logical_ep_id are 32bit");
- printf(_5TABS" integers from -1 to 31.");
- printf(_5TABS" rmnet_mode is a 1 byte");
- printf(_5TABS" unsigned integer of");
- printf(_5TABS" value none, vnd or");
- printf(_5TABS" bridged. dev_name");
- printf(_5TABS" and egress_dev_name");
- printf(_5TABS" cannot be larger");
- printf(_5TABS" than 15 characters");
- printf(_5TABS" Returns the status code\n\n");
- printf("rmnetcli unsetlepc <logical_ep_id> Un-sets the logical");
- printf(_2TABS" <dev_name> endpoint configuration for");
- printf(_5TABS" a particular link.");
- printf(_5TABS" integers from -1 to 31.");
- printf(_5TABS" dev_name cannot be larger");
- printf(_5TABS" than 15 characters");
- printf(_5TABS" Returns the status code\n\n");
- printf("rmnetcli getlepc <logical_ep_id> Sets the logical");
- printf(_2TABS" <dev_name> endpoint configuration for a");
- printf(_5TABS" particular link.");
- printf(_5TABS" logical_ep_id are 32bit");
- printf(_5TABS" integers from -1 to 31.");
- printf(_5TABS" Returns the rmnet_mode");
- printf(_5TABS" and egress_dev_name.");
- printf(_5TABS" rmnet_mode is a 1");
- printf(_5TABS" byte unsigned integer");
- printf(_5TABS" of value none, vnd or");
- printf(_5TABS" bridged. dev_name and");
- printf(_5TABS" egress_dev_name cannot be");
- printf(_5TABS" larger than 15 ");
- printf(_5TABS" characters. Returns the");
- printf(_5TABS" status code\n\n");
- printf("rmnetcli newvnd <dev_id> Creates a new");
- printf(_5TABS" virtual network device node.");
- printf(_5TABS" dev_id is an int");
- printf(_5TABS" less than 32. Returns");
- printf(_5TABS" the status code\n\n");
- printf("rmnetcli newvndprefix <dev_id> <name_prefix> Creates");
- printf(_5TABS" virtual network device node.");
- printf(_5TABS" dev_id is an int");
- printf(_5TABS" less than 32. Prefix");
- printf(_5TABS" must be less than");
- printf(_5TABS" 15 chars. Returns");
- printf(_5TABS" the status code\n\n");
- printf("rmnetcli newvndname <dev_id> <name_prefix> Creates");
- printf(_5TABS" virtual network device node.");
- printf(_5TABS" dev_id is an int");
- printf(_5TABS" less than 32. Name");
- printf(_5TABS" must be less than");
- printf(_5TABS" 15 chars. Returns");
- printf(_5TABS" the status code\n\n");
- printf("rmnetcli getvndname <dev_id> Get name of");
- printf(_5TABS" network device node from id\n\n");
- printf("rmnetcli freevnd <dev_id> Removes virtual");
- printf(_5TABS" network device node. dev_name");
- printf(_5TABS" cannot be larger than 15.");
- printf(_5TABS" Returns the status code\n\n");
- printf("rmnetcli addvnctcflow <dev_id> Add a modem flow");
- printf(_2TABS" <mdm_flow_hndl> handle - tc flow handle");
- printf(_2TABS" <tc_flow_hndl> mapping for a virtual network");
- printf(_2TABS" device node\n\n");
- printf("rmnetcli delvnctcflow <dev_id> Delete a modem flow");
- printf(_2TABS" <mdm_flow_hndl> handle - tc flow handle");
- printf(_2TABS" <tc_flow_hndl> mapping for a virtual network");
- printf(_2TABS" device node\n\n");
printf("**************************\n");
printf("RmNet RTM_NETLINK API Usage:\n\n");
- printf("rmnetcli -n newlink <dev_id> Add a vnd w/ newlink");
+ printf("rmnetcli -n newlink <real dev> Add a vnd w/ newlink");
printf(_2TABS" <vnd> string - vnd device_name");
printf(_2TABS" <vnd id> int - new vnd id");
printf(_2TABS" [flags] int - starting flag config\n\n");
- printf("rmnetcli -n changelink <dev_id> Change a vnd's flags");
+ printf("rmnetcli -n changelink <real dev> Change a vnd's flags");
printf(_2TABS" <vnd> string - vnd device_name");
printf(_2TABS" <vnd id> int - new vnd id");
printf(_2TABS" <flags> int - new flag config\n\n");
- printf("rmnetcli -n getlink <dev_name> Get device config\n\n");
- printf("rmnetcli -n dellink <dev_name> Delete a vnd");
+ printf("rmnetcli -n getlink <real dev> Get device config\n\n");
+ printf("rmnetcli -n dellink <real dev> Delete a vnd");
printf(_2TABS" by inputting dev name\n\n");
- printf("rmnetcli -n bridgelink <dev_name> Bridge a vnd and a dev");
+ printf("rmnetcli -n bridgelink <real dev> Bridge a vnd and a dev");
printf(_2TABS" <vnd id> by specifying dev id and vnd id\n\n");
- printf("rmnetcli -n uplinkparam <dev_name> set uplink aggregation parameters");
+ printf("rmnetcli -n uplinkparam <real dev> set uplink aggregation parameters");
printf(_2TABS" <vnd id> string - vnd device_name");
printf(_2TABS" <packet count> int - maximum packet count");
printf(_2TABS" <byte count> int - maximum byte count");
@@ -362,7 +246,6 @@
struct rmnetctl_hndl_s *handle = NULL;
uint16_t error_number = RMNETCTL_CFG_FAILURE_NO_COMMAND;
int return_code = RMNETCTL_LIB_ERR;
- int is_new_api = 0;
if ((!argc) || (!*argv)) {
print_rmnet_api_status(RMNETCTL_LIB_ERR,
@@ -376,7 +259,6 @@
}
if (!strcmp(*argv, "-n")) {
- is_new_api = 1;
return_code = rtrmnet_ctl_init(&handle, &error_number);
if (return_code != RMNETCTL_SUCCESS) {
print_rmnet_api_status(return_code, error_number);
@@ -572,7 +454,7 @@
if (!bearers) {
print_rmnet_api_status(RMNETCTL_INVALID_ARG,
RMNETCTL_CFG_FAILURE_NO_COMMAND);
- rmnetctl_cleanup(handle);
+ rtrmnet_ctl_deinit(handle);
return RMNETCTL_INVALID_ARG;
}
@@ -598,140 +480,12 @@
goto end;
- } else {
- return_code = rmnetctl_init(&handle, &error_number);
- if (return_code != RMNETCTL_SUCCESS) {
- print_rmnet_api_status(return_code, error_number);
- return RMNETCTL_LIB_ERR;
- }
+ }
- }
- error_number = RMNETCTL_CFG_FAILURE_NO_COMMAND;
- return_code = RMNETCTL_LIB_ERR;
- if (!strcmp(*argv, "assocnetdev")) {
- return_code = rmnet_associate_network_device(handle,
- argv[1], &error_number, RMNETCTL_DEVICE_ASSOCIATE);
- } else if (!strcmp(*argv, "unassocnetdev")) {
- return_code = rmnet_associate_network_device(handle,
- argv[1], &error_number, RMNETCTL_DEVICE_UNASSOCIATE);
- } else if (!strcmp(*argv, "getnetdevassoc")) {
- int register_status;
- return_code = rmnet_get_network_device_associated(handle,
- argv[1], ®ister_status, &error_number);
- if (return_code == RMNETCTL_SUCCESS)
- printf("register_status is %d\n", register_status);
- } else if (!strcmp(*argv, "getledf")) {
- uint32_t egress_flags;
- uint16_t agg_size, agg_count;
- return_code = rmnet_get_link_egress_data_format(handle,
- argv[1], &egress_flags, &agg_size, &agg_count, &error_number);
- if (return_code == RMNETCTL_SUCCESS) {
- printf("egress_flags is %u\n", egress_flags);
- printf("agg_size is %u\n", agg_size);
- printf("agg_count is %u\n", agg_count);
- }
- } else if (!strcmp(*argv, "getlidf")) {
- uint32_t ingress_flags;
- uint8_t tail_spacing;
- return_code = rmnet_get_link_ingress_data_format_tailspace(
- handle, argv[1], &ingress_flags, &tail_spacing, &error_number);
- if (return_code == RMNETCTL_SUCCESS) {
- printf("ingress_flags is %u\n", ingress_flags);
- printf("tail_spacing is %u\n", tail_spacing);
- }
- } else if (!strcmp(*argv, "newvndprefix")) {
- _RMNETCLI_CHECKNULL(argv[1]);
- _RMNETCLI_CHECKNULL(argv[2]);
- return_code = rmnet_new_vnd_prefix(handle,
- _STRTOUI32(argv[1]), &error_number, RMNETCTL_NEW_VND, argv[2]);
- } else if (!strcmp(*argv, "newvndname")) {
- _RMNETCLI_CHECKNULL(argv[1]);
- _RMNETCLI_CHECKNULL(argv[2]);
- return_code = rmnet_new_vnd_name(handle,
- _STRTOUI32(argv[1]), &error_number, argv[2]);
- } else if (!strcmp(*argv, "newvnd")) {
- _RMNETCLI_CHECKNULL(argv[1]);
- return_code = rmnet_new_vnd(handle,
- _STRTOUI32(argv[1]), &error_number, RMNETCTL_NEW_VND);
- } else if (!strcmp(*argv, "getvndname")) {
- char buffer[32];
- memset(buffer, 0, 32);
- _RMNETCLI_CHECKNULL(argv[1]);
- return_code = rmnet_get_vnd_name(handle, _STRTOUI32(argv[1]),
- &error_number, buffer, 32);
- if (return_code == RMNETCTL_SUCCESS) {
- printf("VND name: %s\n", buffer);
- }
- } else if (!strcmp(*argv, "freevnd")) {
- _RMNETCLI_CHECKNULL(argv[1]);
- return_code = rmnet_new_vnd(handle,
- _STRTOUI32(argv[1]), &error_number, RMNETCTL_FREE_VND);
- } else if (!strcmp(*argv, "setlidf")) {
- _RMNETCLI_CHECKNULL(argv[1]);
- _RMNETCLI_CHECKNULL(argv[2]);
- _RMNETCLI_CHECKNULL(argv[3]);
- return_code = rmnet_set_link_ingress_data_format_tailspace(
- handle, _STRTOUI32(argv[1]), _STRTOUI8(argv[2]), argv[3],
- &error_number);
- } else if (!strcmp(*argv, "delvnctcflow")) {
- _RMNETCLI_CHECKNULL(argv[1]);
- _RMNETCLI_CHECKNULL(argv[2]);
- _RMNETCLI_CHECKNULL(argv[3]);
- return_code = rmnet_add_del_vnd_tc_flow(handle,
- _STRTOUI32(argv[1]), _STRTOUI32(argv[2]), _STRTOUI32(argv[3]),
- RMNETCTL_DEL_FLOW, &error_number);
- } else if (!strcmp(*argv, "getlepc")) {
- _RMNETCLI_CHECKNULL(argv[1]);
- uint8_t rmnet_mode;
- char *egress_dev_name;
- egress_dev_name = NULL;
- egress_dev_name = (char *)malloc(RMNET_MAX_STR_LEN
- * sizeof(char));
- if (!egress_dev_name) {
- print_rmnet_api_status(RMNETCTL_LIB_ERR,
- RMNETCTL_CFG_FAILURE_EGRESS_DEV_NAME_NULL);
- rmnetctl_cleanup(handle);
- return RMNETCTL_LIB_ERR;
- }
- return_code = rmnet_get_logical_ep_config(handle,
- _STRTOI32(argv[1]), argv[2], &rmnet_mode,
- &egress_dev_name, RMNET_MAX_STR_LEN, &error_number);
- if (return_code == RMNETCTL_SUCCESS) {
- printf("rmnet_mode is %u\n", rmnet_mode);
- printf("egress_dev_name is %s\n", egress_dev_name);
- }
- free(egress_dev_name);
- } else if (!strcmp(*argv, "addvnctcflow")) {
- _RMNETCLI_CHECKNULL(argv[1]);
- _RMNETCLI_CHECKNULL(argv[2]);
- _RMNETCLI_CHECKNULL(argv[3]);
- return_code = rmnet_add_del_vnd_tc_flow(handle,
- _STRTOUI32(argv[1]), _STRTOUI32(argv[2]), _STRTOUI32(argv[3]),
- RMNETCTL_ADD_FLOW, &error_number);
- } else if (!strcmp(*argv, "setledf")) {
- _RMNETCLI_CHECKNULL(argv[1]);
- _RMNETCLI_CHECKNULL(argv[2]);
- _RMNETCLI_CHECKNULL(argv[3]);
- return_code = rmnet_set_link_egress_data_format(handle,
- _STRTOUI32(argv[1]), _STRTOUI16(argv[2]), _STRTOUI16(argv[3]),
- argv[4], &error_number);
- } else if (!strcmp(*argv, "setlepc")) {
- _RMNETCLI_CHECKNULL(argv[1]);
- _RMNETCLI_CHECKNULL(argv[2]);
- return_code = rmnet_set_logical_ep_config(handle,
- _STRTOI32(argv[1]), _STRTOUI8(argv[2]), argv[3], argv[4],
- &error_number);
- } else if (!strcmp(*argv, "unsetlepc")) {
- _RMNETCLI_CHECKNULL(argv[1]);
- return_code = rmnet_unset_logical_ep_config(handle,
- _STRTOI32(argv[1]), argv[2], &error_number);
- }
end:
print_rmnet_api_status(return_code, error_number);
- if (is_new_api)
- rtrmnet_ctl_deinit(handle);
- else
- rmnetctl_cleanup(handle);
+ rtrmnet_ctl_deinit(handle);
+
return return_code;
}
diff --git a/rmnetctl/inc/librmnetctl.h b/rmnetctl/inc/librmnetctl.h
index 2472dde..4ff7281 100644
--- a/rmnetctl/inc/librmnetctl.h
+++ b/rmnetctl/inc/librmnetctl.h
@@ -201,350 +201,6 @@
===========================================================================*/
typedef struct rmnetctl_hndl_s rmnetctl_hndl_t;
-/*!
-* @brief Public API to initialize the RMNET control driver
-* @details Allocates memory for the RmNet handle. Creates and binds to a and
-* netlink socket if successful
-* @param **rmnetctl_hndl_t_val RmNet handle to be initialized
-* @return RMNETCTL_SUCCESS if successful
-* @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
-* @return RMNETCTL_KERNEL_ERR if there was an error in the kernel.
-* Check error_code
-* @return RMNETCTL_INVALID_ARG if invalid arguments were passed to the API
-*/
-int rmnetctl_init(rmnetctl_hndl_t **hndl, uint16_t *error_code);
-
-/*!
-* @brief Public API to clean up the RmNeT control handle
-* @details Close the socket and free the RmNet handle
-* @param *rmnetctl_hndl_t_val RmNet handle to be initialized
-* @return void
-*/
-void rmnetctl_cleanup(rmnetctl_hndl_t *hndl);
-
-/*!
-* @brief Public API to register/unregister a RMNET driver on a particular device
-* @details Message type is RMNET_NETLINK_ASSOCIATE_NETWORK_DEVICE or
-* RMNET_NETLINK_UNASSOCIATE_NETWORK_DEVICE based on the flag for assoc_dev
-* @param *rmnetctl_hndl_t_val RmNet handle for the Netlink message
-* @param dev_name Device on which to register the RmNet driver
-* @param error_code Status code of this operation
-* @param assoc_dev registers the device if RMNETCTL_DEVICE_ASSOCIATE or
-* unregisters the device if RMNETCTL_DEVICE_UNASSOCIATE
-* @return RMNETCTL_SUCCESS if successful
-* @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
-* @return RMNETCTL_KERNEL_ERR if there was an error in the kernel.
-* Check error_code
-* @return RMNETCTL_INVALID_ARG if invalid arguments were passed to the API
-*/
-int rmnet_associate_network_device(rmnetctl_hndl_t *hndl,
- const char *dev_name,
- uint16_t *error_code,
- uint8_t assoc_dev);
-
-/*!
-* @brief Public API to get if a RMNET driver is registered on a particular
-* device
-* @details Message type is RMNET_NETLINK_GET_NETWORK_DEVICE_ASSOCIATED.
-* @param *rmnetctl_hndl_t_val RmNet handle for the Netlink message
-* @param dev_name Device on which to check if the RmNet driver is registered
-* @param register_status 1 if RmNet data driver is registered on a particular
-* device, 0 if not
-* @param error_code Status code of this operation
-* @return RMNETCTL_SUCCESS if successful
-* @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
-* @return RMNETCTL_KERNEL_ERR if there was an error in the kernel.
-* Check error_code
-* @return RMNETCTL_INVALID_ARG if invalid arguments were passed to the API
-*/
-int rmnet_get_network_device_associated(rmnetctl_hndl_t *hndl,
- const char *dev_name,
- int *register_status,
- uint16_t *error_code);
-
-/*!
-* @brief Public API to set the egress data format for a particular link.
-* @details Message type is RMNET_NETLINK_SET_LINK_EGRESS_DATA_FORMAT.
-* @param *rmnetctl_hndl_t_val RmNet handle for the Netlink message
-* @param egress_flags Egress flags to be set on the device
-* @param agg_size Max size of aggregated packets
-* @param agg_count Number of packets to be aggregated
-* @param dev_name Device on which to set the egress data format
-* @param error_code Status code of this operation returned from the kernel
-* @return RMNETCTL_SUCCESS if successful
-* @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
-* @return RMNETCTL_KERNEL_ERR if there was an error in the kernel.
-* Check error_code
-* @return RMNETCTL_INVALID_ARG if invalid arguments were passed to the API
-*/
-int rmnet_set_link_egress_data_format(rmnetctl_hndl_t *hndl,
- uint32_t egress_flags,
- uint16_t agg_size,
- uint16_t agg_count,
- const char *dev_name,
- uint16_t *error_code);
-
-/*!
-* @brief Public API to get the egress data format for a particular link.
-* @details Message type is RMNET_NETLINK_GET_LINK_EGRESS_DATA_FORMAT.
-* @param *rmnetctl_hndl_t_val RmNet handle for the Netlink message
-* @param dev_name Device on which to get the egress data format
-* @param egress_flags Egress flags from the device
-* @param agg_count Number of packets to be aggregated
-* @param error_code Status code of this operation returned from the kernel
-* @return RMNETCTL_SUCCESS if successful
-* @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
-* @return RMNETCTL_KERNEL_ERR if there was an error in the kernel.
-* Check error_code
-* @return RMNETCTL_INVALID_ARG if invalid arguments were passed to the API
-*/
-int rmnet_get_link_egress_data_format(rmnetctl_hndl_t *hndl,
- const char *dev_name,
- uint32_t *egress_flags,
- uint16_t *agg_size,
- uint16_t *agg_count,
- uint16_t *error_code);
-
-/*!
-* @brief Public API to set the ingress data format for a particular link.
-* @details Message type is RMNET_NETLINK_SET_LINK_INGRESS_DATA_FORMAT.
-* @param *rmnetctl_hndl_t_val RmNet handle for the Netlink message
-* @param ingress_flags Ingress flags from the device
-* @param tail_spacing Tail spacing needed for the packet
-* @param dev_name Device on which to set the ingress data format
-* @param error_code Status code of this operation returned from the kernel
-* @return RMNETCTL_SUCCESS if successful
-* @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
-* @return RMNETCTL_KERNEL_ERR if there was an error in the kernel.
-* Check error_code
-* @return RMNETCTL_INVALID_ARG if invalid arguments were passed to the API
-*/
-int rmnet_set_link_ingress_data_format_tailspace(rmnetctl_hndl_t *hndl,
- uint32_t ingress_flags,
- uint8_t tail_spacing,
- const char *dev_name,
- uint16_t *error_code);
-
-/*!
-* @brief Public API to get the ingress data format for a particular link.
-* @details Message type is RMNET_NETLINK_GET_LINK_INGRESS_DATA_FORMAT.
-* @param *rmnetctl_hndl_t_val RmNet handle for the Netlink message
-* @param dev_name Device on which to get the ingress data format
-* @param ingress_flags Ingress flags from the device
-* @param tail_spacing Tail spacing needed for the packet
-* @param error_code Status code of this operation returned from the kernel
-* @return RMNETCTL_SUCCESS if successful
-* @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
-* @return RMNETCTL_KERNEL_ERR if there was an error in the kernel.
-* Check error_code
-* @return RMNETCTL_INVALID_ARG if invalid arguments were passed to the API
-*/
-int rmnet_get_link_ingress_data_format_tailspace(rmnetctl_hndl_t *hndl,
- const char *dev_name,
- uint32_t *ingress_flags,
- uint8_t *tail_spacing,
- uint16_t *error_code);
-
-inline int rmnet_set_link_ingress_data_format(rmnetctl_hndl_t *hndl,
- uint32_t ingress_flags,
- const char *dev_name,
- uint16_t *error_code)
-{
- return rmnet_set_link_ingress_data_format_tailspace(hndl,
- ingress_flags,
- 0,
- dev_name,
- error_code);
-}
-
-inline int rmnet_get_link_ingress_data_format(rmnetctl_hndl_t *hndl,
- const char *dev_name,
- uint32_t *ingress_flags,
- uint16_t *error_code)
-{
- return rmnet_get_link_ingress_data_format_tailspace(hndl,
- dev_name,
- ingress_flags,
- 0,
- error_code);
-}
-
-/*!
-* @brief Public API to set the logical endpoint configuration for a
-* particular link.
-* @details Message type is RMNET_NETLINK_SET_LOGICAL_EP_CONFIG.
-* @param *rmnetctl_hndl_t_val RmNet handle for the Netlink message
-* @param logical_ep_id Logical end point id on which the configuration is to be
-* set
-* @param rmnet_mode RmNet mode to be set on the device
-* @param dev_name Device on which to set the logical end point configuration
-* @param egress_dev_name Egress Device if operating in bridge mode
-* @param error_code Status code of this operation returned from the kernel
-* @return RMNETCTL_SUCCESS if successful
-* @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
-* @return RMNETCTL_KERNEL_ERR if there was an error in the kernel.
-* Check error_code
-* @return RMNETCTL_INVALID_ARG if invalid arguments were passed to the API
-*/
-int rmnet_set_logical_ep_config(rmnetctl_hndl_t *hndl,
- int32_t ep_id,
- uint8_t operating_mode,
- const char *dev_name,
- const char *next_dev,
- uint16_t *error_code);
-
-/*!
-* @brief Public API to un-set the logical endpoint configuration for a
-* particular link.
-* @details Message type is RMNET_NETLINK_UNSET_LOGICAL_EP_CONFIG.
-* @param *rmnetctl_hndl_t_val RmNet handle for the Netlink message
-* @param logical_ep_id Logical end point id on which the configuration is to be
-* un-set
-* @param dev_name Device on which to un-set the logical end point configuration
-* @param error_code Status code of this operation returned from the kernel
-* @return RMNETCTL_SUCCESS if successful
-* @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
-* @return RMNETCTL_KERNEL_ERR if there was an error in the kernel.
-* Check error_code
-* @return RMNETCTL_INVALID_ARG if invalid arguments were passed to the API
-*/
-int rmnet_unset_logical_ep_config(rmnetctl_hndl_t *hndl,
- int32_t ep_id,
- const char *dev_name,
- uint16_t *error_code);
-/*!
-* @brief Public API to get the logical endpoint configuration for a
-* particular link.
-* @details Message type is RMNET_NETLINK_GET_LOGICAL_EP_CONFIG.
-* @param *rmnetctl_hndl_t_val RmNet handle for the Netlink message
-* @param logical_ep_id Logical end point id from which to get the configuration
-* @param dev_name Device on which to get the logical end point configuration
-* @param rmnet_mode RmNet mode from the device
-* @param next_dev Egress Device name
-* @param next_dev_len Egress Device I/O string len
-* @param error_code Status code of this operation returned from the kernel
-* @return RMNETCTL_SUCCESS if successful
-* @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
-* @return RMNETCTL_KERNEL_ERR if there was an error in the kernel.
-* Check error_code
-* @return RMNETCTL_INVALID_ARG if invalid arguments were passed to the API
-*/
-int rmnet_get_logical_ep_config(rmnetctl_hndl_t *hndl,
- int32_t ep_id,
- const char *dev_name,
- uint8_t *operating_mode,
- char **next_dev,
- uint32_t next_dev_len,
- uint16_t *error_code);
-
-/*!
-* @brief Public API to create a new virtual device node
-* @details Message type is RMNET_NETLINK_NEW_VND or
-* RMNETCTL_FREE_VND based on the flag for new_vnd
-* @param hndl RmNet handle for the Netlink message
-* @param id Node number to create the virtual network device node
-* @param error_code Status code of this operation returned from the kernel
-* @param new_vnd creates a new virtual network device if RMNETCTL_NEW_VND or
-* frees the device if RMNETCTL_FREE_VND
-* @return RMNETCTL_SUCCESS if successful
-* @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
-* @return RMNETCTL_KERNEL_ERR if there was an error in the kernel.
-* Check error_code
-* @return RMNETCTL_INVALID_ARG if invalid arguments were passed to the API
-*/
-int rmnet_new_vnd(rmnetctl_hndl_t *hndl,
- uint32_t id,
- uint16_t *error_code,
- uint8_t new_vnd);
-
-/*!
- * @brief Public API to create a new virtual device node with a custom prefix
- * @details Message type is RMNET_NETLINK_NEW_VND or
- * RMNETCTL_FREE_VND based on the flag for new_vnd
- * @param hndl RmNet handle for the Netlink message
- * @param id Node number to create the virtual network device node
- * @param error_code Status code of this operation returned from the kernel
- * @param new_vnd creates a new virtual network device if RMNETCTL_NEW_VND or
- * frees the device if RMNETCTL_FREE_VND
- * @param prefix Prefix to be used when naming the network interface
- * @return RMNETCTL_SUCCESS if successful
- * @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
- * @return RMNETCTL_KERNEL_ERR if there was an error in the kernel.
- * Check error_code
- * @return RMNETCTL_INVALID_ARG if invalid arguments were passed to the API
- */
-int rmnet_new_vnd_prefix(rmnetctl_hndl_t *hndl,
- uint32_t id,
- uint16_t *error_code,
- uint8_t new_vnd,
- const char *prefix);
-
-/*!
- * @brief Public API to create a new virtual device node with a custom prefix
- * @details Message type is RMNET_NETLINK_NEW_VND or
- * RMNETCTL_FREE_VND based on the flag for new_vnd
- * @param hndl RmNet handle for the Netlink message
- * @param id Node number to create the virtual network device node
- * @param error_code Status code of this operation returned from the kernel
- * @param new_vnd creates a new virtual network device if RMNETCTL_NEW_VND or
- * frees the device if RMNETCTL_FREE_VND
- * @param name Name to be used when naming the network interface
- * @return RMNETCTL_SUCCESS if successful
- * @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
- * @return RMNETCTL_KERNEL_ERR if there was an error in the kernel.
- * Check error_code
- * @return RMNETCTL_INVALID_ARG if invalid arguments were passed to the API
- */
-int rmnet_new_vnd_name(rmnetctl_hndl_t *hndl,
- uint32_t id,
- uint16_t *error_code,
- const char *name);
-
-/*!
- * @brief API to get the ASCII name of a virtual network device from its ID
- * @param hndl RmNet handle for the Netlink message
- * @param id Node number to create the virtual network device node
- * @param error_code Status code of this operation returned from the kernel
- * @param buf Buffer to store ASCII representation of device name
- * @param buflen Length of the buffer
- * @param prefix Prefix to be used when naming the network interface
- * @return RMNETCTL_SUCCESS if successful
- * @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
- * @return RMNETCTL_KERNEL_ERR if there was an error in the kernel.
- * Check error_code
- * @return RMNETCTL_INVALID_ARG if invalid arguments were passed to the API
- */
-
-int rmnet_get_vnd_name(rmnetctl_hndl_t *hndl,
- uint32_t id,
- uint16_t *error_code,
- char *buf,
- uint32_t buflen);
-
-/*!
-* @brief Public API to set or clear a flow
-* @details Message type is RMNET_NETLINK_ADD_VND_TC_FLOW or
-* RMNET_NETLINK_DEL_VND_TC_FLOW based on the flag for set_flow
-* @param *rmnetctl_hndl_t_val RmNet handle for the Netlink message
-* @param id Node number to set or clear the flow on the virtual network
-* device node
-* @param map_flow_id Flow handle of the modem
-* @param tc_flow_id Software flow handle
-* @param set_flow sets the flow if RMNET_NETLINK_SET_FLOW or
-* clears the flow if RMNET_NETLINK_CLEAR_FLOW
-* @return RMNETCTL_SUCCESS if successful
-* @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
-* @return RMNETCTL_KERNEL_ERR if there was an error in the kernel.
-* Check error_code
-* @return RMNETCTL_INVALID_ARG if invalid arguments were passed to the API
-*/
-int rmnet_add_del_vnd_tc_flow(rmnetctl_hndl_t *hndl,
- uint32_t id,
- uint32_t map_flow_id,
- uint32_t tc_flow_id,
- uint8_t set_flow,
- uint16_t *error_code);
-
/* @brief Public API to initialize the RTM_NETLINK RMNET control driver
* @details Allocates memory for the RmNet handle. Creates and binds to a
* netlink socket if successful
diff --git a/rmnetctl/src/librmnetctl.c b/rmnetctl/src/librmnetctl.c
index a51c389..9c81910 100644
--- a/rmnetctl/src/librmnetctl.c
+++ b/rmnetctl/src/librmnetctl.c
@@ -53,7 +53,6 @@
#include <linux/gen_stats.h>
#include <net/if.h>
#include <asm/types.h>
-#include <linux/rmnet_data.h>
#include "librmnetctl_hndl.h"
#include "librmnetctl.h"
@@ -196,123 +195,6 @@
return *dst_size;
}
-
-/*!
-* @brief Synchronous method to send and receive messages to and from the kernel
-* using netlink sockets
-* @details Increments the transaction id for each message sent to the kernel.
-* Sends the netlink message to the kernel and receives the response from the
-* kernel.
-* @param *hndl RmNet handle for this transaction
-* @param request Message to be sent to the kernel
-* @param response Message received from the kernel
-* @return RMNETCTL_API_SUCCESS if successfully able to send and receive message
-* from the kernel
-* @return RMNETCTL_API_ERR_HNDL_INVALID if RmNet handle for the transaction was
-* NULL
-* @return RMNETCTL_API_ERR_REQUEST_NULL not enough memory to create buffer for
-* sending the message
-* @return RMNETCTL_API_ERR_MESSAGE_SEND if could not send the message to kernel
-* @return RMNETCTL_API_ERR_MESSAGE_RECEIVE if could not receive message from the
-* kernel
-* @return RMNETCTL_API_ERR_MESSAGE_TYPE if the request and response type do not
-* match
-*/
-static uint16_t rmnetctl_transact(rmnetctl_hndl_t *hndl,
- struct rmnet_nl_msg_s *request,
- struct rmnet_nl_msg_s *response) {
- uint8_t *request_buf, *response_buf;
- struct nlmsghdr *nlmsghdr_val;
- struct rmnet_nl_msg_s *rmnet_nl_msg_s_val;
- ssize_t bytes_read = -1, buffsize = MAX_BUF_SIZE - sizeof(struct nlmsghdr);
- uint16_t return_code = RMNETCTL_API_ERR_HNDL_INVALID;
- struct sockaddr_nl* __attribute__((__may_alias__)) saddr_ptr;
- request_buf = NULL;
- response_buf = NULL;
- nlmsghdr_val = NULL;
- rmnet_nl_msg_s_val = NULL;
- do {
- if (!hndl){
- break;
- }
- if (!request){
- return_code = RMNETCTL_API_ERR_REQUEST_NULL;
- break;
- }
- if (!response){
- return_code = RMNETCTL_API_ERR_RESPONSE_NULL;
- break;
- }
- request_buf = (uint8_t *)malloc(MAX_BUF_SIZE * sizeof(uint8_t));
- if (!request_buf){
- return_code = RMNETCTL_API_ERR_REQUEST_NULL;
- break;
- }
-
- response_buf = (uint8_t *)malloc(MAX_BUF_SIZE * sizeof(uint8_t));
- if (!response_buf) {
- return_code = RMNETCTL_API_ERR_RESPONSE_NULL;
- break;
- }
-
- nlmsghdr_val = (struct nlmsghdr *)request_buf;
- rmnet_nl_msg_s_val = (struct rmnet_nl_msg_s *)NLMSG_DATA(request_buf);
-
- memset(request_buf, 0, MAX_BUF_SIZE*sizeof(uint8_t));
- memset(response_buf, 0, MAX_BUF_SIZE*sizeof(uint8_t));
-
- nlmsghdr_val->nlmsg_seq = hndl->transaction_id;
- nlmsghdr_val->nlmsg_pid = hndl->pid;
- nlmsghdr_val->nlmsg_len = MAX_BUF_SIZE;
-
- memscpy((void *)NLMSG_DATA(request_buf), buffsize, request,
- sizeof(struct rmnet_nl_msg_s));
-
- rmnet_nl_msg_s_val->crd = RMNET_NETLINK_MSG_COMMAND;
- hndl->transaction_id++;
-
- saddr_ptr = &hndl->dest_addr;
- socklen_t addrlen = sizeof(struct sockaddr_nl);
- if (sendto(hndl->netlink_fd,
- request_buf,
- MAX_BUF_SIZE,
- RMNETCTL_SOCK_FLAG,
- (struct sockaddr*)saddr_ptr,
- sizeof(struct sockaddr_nl)) < 0) {
- return_code = RMNETCTL_API_ERR_MESSAGE_SEND;
- break;
- }
-
- saddr_ptr = &hndl->src_addr;
- bytes_read = recvfrom(hndl->netlink_fd,
- response_buf,
- MAX_BUF_SIZE,
- RMNETCTL_SOCK_FLAG,
- (struct sockaddr*)saddr_ptr,
- &addrlen);
- if (bytes_read < 0) {
- return_code = RMNETCTL_API_ERR_MESSAGE_RECEIVE;
- break;
- }
- buffsize = MAX_BUF_SIZE - sizeof(struct nlmsghdr);
- memscpy(response, buffsize, (void *)NLMSG_DATA(response_buf),
- sizeof(struct rmnet_nl_msg_s));
- if (sizeof(*response) < sizeof(struct rmnet_nl_msg_s)) {
- return_code = RMNETCTL_API_ERR_RESPONSE_NULL;
- break;
- }
-
- if (request->message_type != response->message_type) {
- return_code = RMNETCTL_API_ERR_MESSAGE_TYPE;
- break;
- }
- return_code = RMNETCTL_SUCCESS;
- } while(0);
- free(request_buf);
- free(response_buf);
- return return_code;
-}
-
/*!
* @brief Static function to check the dev name
* @details Checks if the name is not NULL and if the name is less than the
@@ -326,730 +208,17 @@
do {
if (!dev_name)
break;
- if (strlen(dev_name) >= RMNET_MAX_STR_LEN)
+ if (strlen(dev_name) >= IFNAMSIZ)
break;
return_code = RMNETCTL_SUCCESS;
} while(0);
return return_code;
}
-/*!
-* @brief Static function to check the string length after a copy
-* @details Checks if the string length is not lesser than zero and lesser than
-* RMNET_MAX_STR_LEN
-* @param str_len length of the string after a copy
-* @param error_code Status code of this operation
-* @return RMNETCTL_SUCCESS if successful
-* @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
-*/
-static inline int _rmnetctl_check_len(size_t str_len, uint16_t *error_code) {
- int return_code = RMNETCTL_LIB_ERR;
- do {
- if (str_len > RMNET_MAX_STR_LEN) {
- *error_code = RMNETCTL_API_ERR_STRING_TRUNCATION;
- break;
- }
- return_code = RMNETCTL_SUCCESS;
- } while(0);
- return return_code;
-}
-
-/*!
-* @brief Static function to check the response type
-* @details Checks if the response type of this message was return code
-* @param crd The crd field passed
-* @param error_code Status code of this operation
-* @return RMNETCTL_SUCCESS if successful
-* @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
-*/
-static inline int _rmnetctl_check_code(int crd, uint16_t *error_code) {
- int return_code = RMNETCTL_LIB_ERR;
- do {
- if (crd != RMNET_NETLINK_MSG_RETURNCODE) {
- *error_code = RMNETCTL_API_ERR_RETURN_TYPE;
- break;
- }
- return_code = RMNETCTL_SUCCESS;
- } while(0);
- return return_code;
-}
-
-/*!
-* @brief Static function to check the response type
-* @details Checks if the response type of this message was data
-* @param crd The crd field passed
-* @param error_code Status code of this operation
-* @return RMNETCTL_SUCCESS if successful
-* @return RMNETCTL_LIB_ERR if there was a library error. Check error_code
-*/
-static inline int _rmnetctl_check_data(int crd, uint16_t *error_code) {
- int return_code = RMNETCTL_LIB_ERR;
- do {
- if (crd != RMNET_NETLINK_MSG_RETURNDATA) {
- *error_code = RMNETCTL_API_ERR_RETURN_TYPE;
- break;
- }
- return_code = RMNETCTL_SUCCESS;
- } while(0);
- return return_code;
-}
-
-/*!
-* @brief Static function to set the return value
-* @details Checks if the error_code from the transaction is zero for a return
-* code type message and sets the message type as RMNETCTL_SUCCESS
-* @param crd The crd field passed
-* @param error_code Status code of this operation
-* @return RMNETCTL_SUCCESS if successful
-* @return RMNETCTL_KERNEL_ERR if there was an error in the kernel.
-* Check error_code
-*/
-static inline int _rmnetctl_set_codes(int error_val, uint16_t *error_code) {
- int return_code = RMNETCTL_KERNEL_ERR;
- if (error_val == RMNET_CONFIG_OK)
- return_code = RMNETCTL_SUCCESS;
- else
- *error_code = (uint16_t)error_val + RMNETCTL_KERNEL_FIRST_ERR;
- return return_code;
-}
-
/*===========================================================================
EXPOSED API
===========================================================================*/
-int rmnetctl_init(rmnetctl_hndl_t **hndl, uint16_t *error_code)
-{
- pid_t pid = 0;
- int netlink_fd = -1, return_code = RMNETCTL_LIB_ERR;
- struct sockaddr_nl* __attribute__((__may_alias__)) saddr_ptr;
- do {
- if ((!hndl) || (!error_code)){
- return_code = RMNETCTL_INVALID_ARG;
- break;
- }
-
- *hndl = (rmnetctl_hndl_t *)malloc(sizeof(rmnetctl_hndl_t));
- if (!*hndl) {
- *error_code = RMNETCTL_API_ERR_HNDL_INVALID;
- break;
- }
-
- memset(*hndl, 0, sizeof(rmnetctl_hndl_t));
-
- pid = getpid();
- if (pid < MIN_VALID_PROCESS_ID) {
- free(*hndl);
- *error_code = RMNETCTL_INIT_ERR_PROCESS_ID;
- break;
- }
- (*hndl)->pid = (uint32_t)pid;
- netlink_fd = socket(PF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, RMNET_NETLINK_PROTO);
- if (netlink_fd < MIN_VALID_SOCKET_FD) {
- free(*hndl);
- *error_code = RMNETCTL_INIT_ERR_NETLINK_FD;
- break;
- }
-
- (*hndl)->netlink_fd = netlink_fd;
-
- memset(&(*hndl)->src_addr, 0, sizeof(struct sockaddr_nl));
-
- (*hndl)->src_addr.nl_family = AF_NETLINK;
- (*hndl)->src_addr.nl_pid = (*hndl)->pid;
-
- saddr_ptr = &(*hndl)->src_addr;
- if (bind((*hndl)->netlink_fd,
- (struct sockaddr*)saddr_ptr,
- sizeof(struct sockaddr_nl)) < 0) {
- close((*hndl)->netlink_fd);
- free(*hndl);
- *error_code = RMNETCTL_INIT_ERR_BIND;
- break;
- }
-
- memset(&(*hndl)->dest_addr, 0, sizeof(struct sockaddr_nl));
-
- (*hndl)->dest_addr.nl_family = AF_NETLINK;
- (*hndl)->dest_addr.nl_pid = KERNEL_PROCESS_ID;
- (*hndl)->dest_addr.nl_groups = UNICAST;
-
- return_code = RMNETCTL_SUCCESS;
- } while(0);
- return return_code;
-}
-
-void rmnetctl_cleanup(rmnetctl_hndl_t *hndl)
-{
- if (!hndl)
- return;
- close(hndl->netlink_fd);
- free(hndl);
-}
-
-int rmnet_associate_network_device(rmnetctl_hndl_t *hndl,
- const char *dev_name,
- uint16_t *error_code,
- uint8_t assoc_dev)
-{
- struct rmnet_nl_msg_s request, response;
- size_t str_len = 0;
- int return_code = RMNETCTL_LIB_ERR;
- do {
- if ((!hndl) || (!error_code) || _rmnetctl_check_dev_name(dev_name) ||
- ((assoc_dev != RMNETCTL_DEVICE_ASSOCIATE) &&
- (assoc_dev != RMNETCTL_DEVICE_UNASSOCIATE))) {
- return_code = RMNETCTL_INVALID_ARG;
- break;
- }
-
- if (assoc_dev == RMNETCTL_DEVICE_ASSOCIATE)
- request.message_type = RMNET_NETLINK_ASSOCIATE_NETWORK_DEVICE;
- else
- request.message_type = RMNET_NETLINK_UNASSOCIATE_NETWORK_DEVICE;
-
- request.arg_length = RMNET_MAX_STR_LEN;
- str_len = strlcpy((char *)(request.data), dev_name, (size_t)RMNET_MAX_STR_LEN);
- if (_rmnetctl_check_len(str_len, error_code) != RMNETCTL_SUCCESS)
- break;
-
- if ((*error_code = rmnetctl_transact(hndl, &request, &response))
- != RMNETCTL_SUCCESS)
- break;
- if (_rmnetctl_check_code(response.crd, error_code) != RMNETCTL_SUCCESS)
- break;
- return_code = _rmnetctl_set_codes(response.return_code, error_code);
- } while(0);
- return return_code;
-}
-
-int rmnet_get_network_device_associated(rmnetctl_hndl_t *hndl,
- const char *dev_name,
- int *register_status,
- uint16_t *error_code) {
- struct rmnet_nl_msg_s request, response;
- size_t str_len = 0;
- int return_code = RMNETCTL_LIB_ERR;
- do {
- if ((!hndl) || (!register_status) || (!error_code) ||
- _rmnetctl_check_dev_name(dev_name)) {
- return_code = RMNETCTL_INVALID_ARG;
- break;
- }
-
- request.message_type = RMNET_NETLINK_GET_NETWORK_DEVICE_ASSOCIATED;
-
- request.arg_length = RMNET_MAX_STR_LEN;
- str_len = strlcpy((char *)(request.data), dev_name, RMNET_MAX_STR_LEN);
- if (_rmnetctl_check_len(str_len, error_code) != RMNETCTL_SUCCESS)
- break;
-
- if ((*error_code = rmnetctl_transact(hndl, &request, &response))
- != RMNETCTL_SUCCESS)
- break;
-
- if (_rmnetctl_check_data(response.crd, error_code)
- != RMNETCTL_SUCCESS) {
- if (_rmnetctl_check_code(response.crd, error_code)
- == RMNETCTL_SUCCESS)
- return_code = _rmnetctl_set_codes(response.return_code,
- error_code);
- break;
- }
-
- *register_status = response.return_code;
- return_code = RMNETCTL_SUCCESS;
- } while(0);
- return return_code;
-}
-
-int rmnet_set_link_egress_data_format(rmnetctl_hndl_t *hndl,
- uint32_t egress_flags,
- uint16_t agg_size,
- uint16_t agg_count,
- const char *dev_name,
- uint16_t *error_code) {
- struct rmnet_nl_msg_s request, response;
- size_t str_len = 0;
- int return_code = RMNETCTL_LIB_ERR;
- do {
- if ((!hndl) || (!error_code) || _rmnetctl_check_dev_name(dev_name) ||
- ((~EGRESS_FLAGS_MASK) & egress_flags)) {
- return_code = RMNETCTL_INVALID_ARG;
- break;
- }
-
- request.message_type = RMNET_NETLINK_SET_LINK_EGRESS_DATA_FORMAT;
-
- request.arg_length = RMNET_MAX_STR_LEN +
- sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t);
- str_len = strlcpy((char *)(request.data_format.dev),
- dev_name,
- RMNET_MAX_STR_LEN);
- if (_rmnetctl_check_len(str_len, error_code) != RMNETCTL_SUCCESS)
- break;
-
- request.data_format.flags = egress_flags;
- request.data_format.agg_size = agg_size;
- request.data_format.agg_count = agg_count;
-
- if ((*error_code = rmnetctl_transact(hndl, &request, &response))
- != RMNETCTL_SUCCESS)
- break;
-
- if (_rmnetctl_check_code(response.crd, error_code) != RMNETCTL_SUCCESS)
- break;
-
- return_code = _rmnetctl_set_codes(response.return_code, error_code);
- } while(0);
- return return_code;
-}
-
-int rmnet_get_link_egress_data_format(rmnetctl_hndl_t *hndl,
- const char *dev_name,
- uint32_t *egress_flags,
- uint16_t *agg_size,
- uint16_t *agg_count,
- uint16_t *error_code) {
- struct rmnet_nl_msg_s request, response;
- size_t str_len = 0;
- int return_code = RMNETCTL_LIB_ERR;
- do {
- if ((!hndl) || (!egress_flags) || (!agg_size) || (!agg_count) ||
- (!error_code) || _rmnetctl_check_dev_name(dev_name)) {
- return_code = RMNETCTL_INVALID_ARG;
- break;
- }
- request.message_type = RMNET_NETLINK_GET_LINK_EGRESS_DATA_FORMAT;
-
- request.arg_length = RMNET_MAX_STR_LEN;
- str_len = strlcpy((char *)(request.data_format.dev),
- dev_name,
- RMNET_MAX_STR_LEN);
- if (_rmnetctl_check_len(str_len, error_code) != RMNETCTL_SUCCESS)
- break;
-
- if ((*error_code = rmnetctl_transact(hndl, &request, &response))
- != RMNETCTL_SUCCESS)
- break;
-
- if (_rmnetctl_check_data(response.crd, error_code)
- != RMNETCTL_SUCCESS) {
- if (_rmnetctl_check_code(response.crd, error_code)
- == RMNETCTL_SUCCESS)
- return_code = _rmnetctl_set_codes(response.return_code,
- error_code);
- break;
- }
-
- *egress_flags = response.data_format.flags;
- *agg_size = response.data_format.agg_size;
- *agg_count = response.data_format.agg_count;
- return_code = RMNETCTL_SUCCESS;
- } while(0);
- return return_code;
-}
-
-int rmnet_set_link_ingress_data_format_tailspace(rmnetctl_hndl_t *hndl,
- uint32_t ingress_flags,
- uint8_t tail_spacing,
- const char *dev_name,
- uint16_t *error_code) {
- struct rmnet_nl_msg_s request, response;
- size_t str_len = 0;
- int return_code = RMNETCTL_LIB_ERR;
- do {
- if ((!hndl) || (!error_code) || _rmnetctl_check_dev_name(dev_name) ||
- ((~INGRESS_FLAGS_MASK) & ingress_flags)) {
- return_code = RMNETCTL_INVALID_ARG;
- break;
- }
-
- request.message_type = RMNET_NETLINK_SET_LINK_INGRESS_DATA_FORMAT;
-
- request.arg_length = RMNET_MAX_STR_LEN +
- sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t);
- str_len = strlcpy((char *)(request.data_format.dev),
- dev_name,
- RMNET_MAX_STR_LEN);
- if (_rmnetctl_check_len(str_len, error_code) != RMNETCTL_SUCCESS)
- break;
- request.data_format.flags = ingress_flags;
- request.data_format.tail_spacing = tail_spacing;
-
- if ((*error_code = rmnetctl_transact(hndl, &request, &response))
- != RMNETCTL_SUCCESS)
- break;
-
- if (_rmnetctl_check_code(response.crd, error_code) != RMNETCTL_SUCCESS)
- break;
-
- return_code = _rmnetctl_set_codes(response.return_code, error_code);
- } while(0);
- return return_code;
-}
-
-int rmnet_get_link_ingress_data_format_tailspace(rmnetctl_hndl_t *hndl,
- const char *dev_name,
- uint32_t *ingress_flags,
- uint8_t *tail_spacing,
- uint16_t *error_code) {
- struct rmnet_nl_msg_s request, response;
- size_t str_len = 0;
- int return_code = RMNETCTL_LIB_ERR;
- do {
- if ((!hndl) || (!error_code) ||
- _rmnetctl_check_dev_name(dev_name)) {
- return_code = RMNETCTL_INVALID_ARG;
- break;
- }
-
- request.message_type = RMNET_NETLINK_GET_LINK_INGRESS_DATA_FORMAT;
-
- request.arg_length = RMNET_MAX_STR_LEN;
- str_len = strlcpy((char *)(request.data_format.dev),
- dev_name,
- RMNET_MAX_STR_LEN);
- if (_rmnetctl_check_len(str_len, error_code) != RMNETCTL_SUCCESS)
- break;
-
- if ((*error_code = rmnetctl_transact(hndl, &request, &response))
- != RMNETCTL_SUCCESS)
- break;
-
- if (_rmnetctl_check_data(response.crd, error_code)
- != RMNETCTL_SUCCESS) {
- if (_rmnetctl_check_code(response.crd, error_code)
- == RMNETCTL_SUCCESS)
- return_code = _rmnetctl_set_codes(response.return_code,
- error_code);
- break;
- }
-
- if (ingress_flags)
- *ingress_flags = response.data_format.flags;
-
- if (tail_spacing)
- *tail_spacing = response.data_format.tail_spacing;
-
- return_code = RMNETCTL_SUCCESS;
- } while(0);
- return return_code;
-}
-
-int rmnet_set_logical_ep_config(rmnetctl_hndl_t *hndl,
- int32_t ep_id,
- uint8_t operating_mode,
- const char *dev_name,
- const char *next_dev,
- uint16_t *error_code) {
- struct rmnet_nl_msg_s request, response;
- size_t str_len = 0;
- int return_code = RMNETCTL_LIB_ERR;
- do {
- if ((!hndl) || ((ep_id < -1) || (ep_id > 31)) || (!error_code) ||
- _rmnetctl_check_dev_name(dev_name) ||
- _rmnetctl_check_dev_name(next_dev) ||
- operating_mode >= RMNET_EPMODE_LENGTH) {
- return_code = RMNETCTL_INVALID_ARG;
- break;
- }
-
- request.message_type = RMNET_NETLINK_SET_LOGICAL_EP_CONFIG;
-
- request.arg_length = RMNET_MAX_STR_LEN +
- RMNET_MAX_STR_LEN + sizeof(int32_t) + sizeof(uint8_t);
- str_len = strlcpy((char *)(request.local_ep_config.dev),
- dev_name,
- RMNET_MAX_STR_LEN);
- if (_rmnetctl_check_len(str_len, error_code) != RMNETCTL_SUCCESS)
- break;
-
- str_len = strlcpy((char *)(request.local_ep_config.next_dev),
- next_dev,
- RMNET_MAX_STR_LEN);
- if (_rmnetctl_check_len(str_len, error_code) != RMNETCTL_SUCCESS)
- break;
- request.local_ep_config.ep_id = ep_id;
- request.local_ep_config.operating_mode = operating_mode;
-
- if ((*error_code = rmnetctl_transact(hndl, &request, &response))
- != RMNETCTL_SUCCESS)
- break;
- if (_rmnetctl_check_code(response.crd, error_code) != RMNETCTL_SUCCESS)
- break;
-
- return_code = _rmnetctl_set_codes(response.return_code, error_code);
- } while(0);
- return return_code;
-}
-
-int rmnet_unset_logical_ep_config(rmnetctl_hndl_t *hndl,
- int32_t ep_id,
- const char *dev_name,
- uint16_t *error_code) {
- struct rmnet_nl_msg_s request, response;
- size_t str_len = 0;
- int return_code = RMNETCTL_LIB_ERR;
- do {
-
- if ((!hndl) || ((ep_id < -1) || (ep_id > 31)) || (!error_code) ||
- _rmnetctl_check_dev_name(dev_name)) {
- return_code = RMNETCTL_INVALID_ARG;
- break;
- }
-
- request.message_type = RMNET_NETLINK_UNSET_LOGICAL_EP_CONFIG;
-
- request.arg_length = RMNET_MAX_STR_LEN + sizeof(int32_t);
- str_len = strlcpy((char *)(request.local_ep_config.dev),
- dev_name,
- RMNET_MAX_STR_LEN);
-
- if (_rmnetctl_check_len(str_len, error_code) != RMNETCTL_SUCCESS)
- break;
-
- request.local_ep_config.ep_id = ep_id;
-
- if ((*error_code = rmnetctl_transact(hndl, &request, &response))
- != RMNETCTL_SUCCESS)
- break;
- if (_rmnetctl_check_code(response.crd, error_code) != RMNETCTL_SUCCESS)
- break;
-
- return_code = _rmnetctl_set_codes(response.return_code, error_code);
- } while(0);
-
- return return_code;
-}
-
-int rmnet_get_logical_ep_config(rmnetctl_hndl_t *hndl,
- int32_t ep_id,
- const char *dev_name,
- uint8_t *operating_mode,
- char **next_dev,
- uint32_t next_dev_len,
- uint16_t *error_code) {
- struct rmnet_nl_msg_s request, response;
- size_t str_len = 0;
- int return_code = RMNETCTL_LIB_ERR;
- do {
- if ((!hndl) || (!operating_mode) || (!error_code) || ((ep_id < -1) ||
- (ep_id > 31)) || _rmnetctl_check_dev_name(dev_name) || (!next_dev)
- || (0 == next_dev_len)) {
- return_code = RMNETCTL_INVALID_ARG;
- break;
- }
-
- request.message_type = RMNET_NETLINK_GET_LOGICAL_EP_CONFIG;
-
- request.arg_length = RMNET_MAX_STR_LEN + sizeof(int32_t);
- str_len = strlcpy((char *)(request.local_ep_config.dev),
- dev_name,
- RMNET_MAX_STR_LEN);
- if (_rmnetctl_check_len(str_len, error_code) != RMNETCTL_SUCCESS)
- break;
-
- request.local_ep_config.ep_id = ep_id;
-
- if ((*error_code = rmnetctl_transact(hndl, &request, &response))
- != RMNETCTL_SUCCESS)
- break;
-
- if (_rmnetctl_check_data(response.crd, error_code)
- != RMNETCTL_SUCCESS) {
- if (_rmnetctl_check_code(response.crd, error_code)
- == RMNETCTL_SUCCESS)
- return_code = _rmnetctl_set_codes(response.return_code,
- error_code);
- break;
- }
-
- str_len = strlcpy(*next_dev,
- (char *)(response.local_ep_config.next_dev),
- min(RMNET_MAX_STR_LEN, next_dev_len));
- if (_rmnetctl_check_len(str_len, error_code) != RMNETCTL_SUCCESS)
- break;
-
- *operating_mode = response.local_ep_config.operating_mode;
- return_code = RMNETCTL_SUCCESS;
- } while(0);
- return return_code;
-}
-
-int rmnet_new_vnd_prefix(rmnetctl_hndl_t *hndl,
- uint32_t id,
- uint16_t *error_code,
- uint8_t new_vnd,
- const char *prefix)
-{
- struct rmnet_nl_msg_s request, response;
- int return_code = RMNETCTL_LIB_ERR;
- size_t str_len = 0;
- do {
- if ((!hndl) || (!error_code) ||
- ((new_vnd != RMNETCTL_NEW_VND) && (new_vnd != RMNETCTL_FREE_VND))) {
- return_code = RMNETCTL_INVALID_ARG;
- break;
- }
-
- memset(request.vnd.vnd_name, 0, RMNET_MAX_STR_LEN);
- if (new_vnd == RMNETCTL_NEW_VND) {
- if (prefix) {
- request.message_type =RMNET_NETLINK_NEW_VND_WITH_PREFIX;
- str_len = strlcpy((char *)request.vnd.vnd_name,
- prefix, RMNET_MAX_STR_LEN);
- if (_rmnetctl_check_len(str_len, error_code)
- != RMNETCTL_SUCCESS)
- break;
- } else {
- request.message_type = RMNET_NETLINK_NEW_VND;
- }
- } else {
- request.message_type = RMNET_NETLINK_FREE_VND;
- }
-
- request.arg_length = sizeof(uint32_t);
- request.vnd.id = id;
-
- if ((*error_code = rmnetctl_transact(hndl, &request, &response))
- != RMNETCTL_SUCCESS)
- break;
- if (_rmnetctl_check_code(response.crd, error_code) != RMNETCTL_SUCCESS)
- break;
-
- return_code = _rmnetctl_set_codes(response.return_code, error_code);
- } while(0);
- return return_code;
-}
-
-int rmnet_new_vnd_name(rmnetctl_hndl_t *hndl,
- uint32_t id,
- uint16_t *error_code,
- const char *prefix)
-{
- struct rmnet_nl_msg_s request, response;
- int return_code = RMNETCTL_LIB_ERR;
- size_t str_len = 0;
- do {
- if ((!hndl) || (!error_code)) {
- return_code = RMNETCTL_INVALID_ARG;
- break;
- }
-
- memset(request.vnd.vnd_name, 0, RMNET_MAX_STR_LEN);
- if (prefix) {
- request.message_type =RMNET_NETLINK_NEW_VND_WITH_NAME;
- str_len = strlcpy((char *)request.vnd.vnd_name,
- prefix, RMNET_MAX_STR_LEN);
- if (_rmnetctl_check_len(str_len, error_code)
- != RMNETCTL_SUCCESS)
- break;
- } else {
- request.message_type = RMNET_NETLINK_NEW_VND;
- }
-
- request.arg_length = sizeof(uint32_t);
- request.vnd.id = id;
-
- if ((*error_code = rmnetctl_transact(hndl, &request, &response))
- != RMNETCTL_SUCCESS)
- break;
- if (_rmnetctl_check_code(response.crd, error_code) != RMNETCTL_SUCCESS)
- break;
-
- return_code = _rmnetctl_set_codes(response.return_code, error_code);
- } while(0);
- return return_code;
-}
-
-int rmnet_new_vnd(rmnetctl_hndl_t *hndl,
- uint32_t id,
- uint16_t *error_code,
- uint8_t new_vnd)
-{
- return rmnet_new_vnd_prefix(hndl, id, error_code, new_vnd, 0);
-}
-
-int rmnet_get_vnd_name(rmnetctl_hndl_t *hndl,
- uint32_t id,
- uint16_t *error_code,
- char *buf,
- uint32_t buflen)
-{
- struct rmnet_nl_msg_s request, response;
- uint32_t str_len;
- int return_code = RMNETCTL_LIB_ERR;
- do {
- if ((!hndl) || (!error_code) || (!buf) || (0 == buflen)) {
- return_code = RMNETCTL_INVALID_ARG;
- break;
- }
-
- request.message_type = RMNET_NETLINK_GET_VND_NAME;
- request.arg_length = sizeof(uint32_t);
- request.vnd.id = id;
-
-
- if ((*error_code = rmnetctl_transact(hndl, &request, &response))
- != RMNETCTL_SUCCESS)
- break;
-
- if (_rmnetctl_check_data(response.crd, error_code)
- != RMNETCTL_SUCCESS) {
- if (_rmnetctl_check_code(response.crd, error_code)
- == RMNETCTL_SUCCESS)
- return_code = _rmnetctl_set_codes(response.return_code,
- error_code);
- break;
- }
-
- str_len = (uint32_t)strlcpy(buf,
- (char *)(response.vnd.vnd_name),
- buflen);
- if (str_len >= buflen) {
- *error_code = RMNETCTL_API_ERR_STRING_TRUNCATION;
- break;
- }
-
- return_code = RMNETCTL_SUCCESS;
- } while (0);
- return return_code;
-}
-
-int rmnet_add_del_vnd_tc_flow(rmnetctl_hndl_t *hndl,
- uint32_t id,
- uint32_t map_flow_id,
- uint32_t tc_flow_id,
- uint8_t set_flow,
- uint16_t *error_code) {
- struct rmnet_nl_msg_s request, response;
- int return_code = RMNETCTL_LIB_ERR;
- do {
- if ((!hndl) || (!error_code) || ((set_flow != RMNETCTL_ADD_FLOW) &&
- (set_flow != RMNETCTL_DEL_FLOW))) {
- return_code = RMNETCTL_INVALID_ARG;
- break;
- }
- if (set_flow == RMNETCTL_ADD_FLOW)
- request.message_type = RMNET_NETLINK_ADD_VND_TC_FLOW;
- else
- request.message_type = RMNET_NETLINK_DEL_VND_TC_FLOW;
-
- request.arg_length = (sizeof(uint32_t))*3;
- request.flow_control.id = id;
- request.flow_control.map_flow_id = map_flow_id;
- request.flow_control.tc_flow_id = tc_flow_id;
-
- if ((*error_code = rmnetctl_transact(hndl, &request, &response))
- != RMNETCTL_SUCCESS)
- break;
- if (_rmnetctl_check_code(response.crd, error_code) != RMNETCTL_SUCCESS)
- break;
- return_code = _rmnetctl_set_codes(response.return_code, error_code);
- } while(0);
- return return_code;
-}
-
/*
* NEW DRIVER API
*/