summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChinh Tran <chinht@quicinc.com>2010-02-08 15:59:46 -0800
committerChinh Tran <chinht@quicinc.com>2010-02-12 14:08:46 -0800
commit9850d1b062e7a5832bc3b66b814369cb57867093 (patch)
tree11ec3493dd5a3d2dcd614a48f7684a2587bd0d59 /include
parent7b3afc04f3ad11c10d964762684caef66f3f5b4d (diff)
downloadandroid_external_connectivity-9850d1b062e7a5832bc3b66b814369cb57867093.tar.gz
android_external_connectivity-9850d1b062e7a5832bc3b66b814369cb57867093.tar.bz2
android_external_connectivity-9850d1b062e7a5832bc3b66b814369cb57867093.zip
external/connectivity/(CNE): Fix multiple network interface in main table
Check the init service and only activate iproute2 when CNE is in use CRs-fixed: 225970
Diffstat (limited to 'include')
-rw-r--r--include/cne/cne.h22
1 files changed, 20 insertions, 2 deletions
diff --git a/include/cne/cne.h b/include/cne/cne.h
index 0b94945..2b66be8 100644
--- a/include/cne/cne.h
+++ b/include/cne/cne.h
@@ -90,6 +90,8 @@
#define CNE_MAX_SSID_LEN 32
#define CNE_MAX_SCANLIST_SIZE 20
#define CNE_MAX_IPADDR_LEN 32
+#define CNE_SERVICE_DISABLED 0
+#define CNE_SERVICE_ENABLED 1
/*----------------------------------------------------------------------------
@@ -176,6 +178,14 @@ typedef enum // correspond to network State defined in NetworkInfo.java
} cne_network_state_enum_type;
+typedef enum
+{
+ CNE_IPROUTE2_ADD_DEFAULT = 0,
+ CNE_IPROUTE2_DELETE_DEFAULT,
+ CNE_IPROUTE2_DELETE_DEFAULT_FROM_MAIN,
+ CNE_IPROUTE2_CHANGE_DEFAULT_FROM_MAIN
+} cne_iproute2_cmd_enum_type;
+
/** Role Id Type. */
typedef int32_t cne_role_id_type;
/** Registration Id Type. */
@@ -451,6 +461,7 @@ typedef union {
} CneRatInfoType;
typedef struct {
+ int32_t type;
int32_t status;
int32_t rssi;
char *ssid;
@@ -486,6 +497,13 @@ typedef struct {
char *ipAddr;
} CneRatStatusType;
+typedef struct {
+ int32_t cmd;
+ char *ifName;
+ char *ipAddr;
+ char *gatewayAddr;
+} CneIpRoute2CmdType;
+
/*----------------------------------------------------------------------------
* Function Declarations and Documentation
* -------------------------------------------------------------------------*/
@@ -495,10 +513,10 @@ typedef struct {
This functions needs to be called only once at the power up.
@param None
@see None
- @return None
+*@return int to indicate if cne service enabled
*/
-void cne_svc_init();
+int cne_svc_init(void);