Add mbtk_source git commit info
Change-Id: I9867613657db269bba81d28c4b3712062ae41bdd
diff --git a/mbtk/test/libmbtk_ril/mbtk_ril_test.c b/mbtk/test/libmbtk_ril/mbtk_ril_test.c
index 20178b3..30ad2a1 100755
--- a/mbtk/test/libmbtk_ril/mbtk_ril_test.c
+++ b/mbtk/test/libmbtk_ril/mbtk_ril_test.c
@@ -64,9 +64,9 @@
printf("power_sim <0,1>: Power off/on sim.\n");
printf("time <0,1,2> YYYY-MM-DD HH:MM:SS : Set system time as CELL/NTP/User.\n");
printf("apn : Get current apns.\n");
- printf("apn <cid> <ip_type:1/2/3/4> <save:0/1> <auto_call:0/1> <apn/null> : Set apn.\n");
+ printf("apn <cid> <ip_type:1/2/3/4> <save:0/1> <auto_call:0/1> <def_route:0/1> <as_dns:0/1> <apn/null> : Set apn.\n");
printf("apn_del <cid> <save:0/1> : Delete APN.\n");
- printf("data_call <0/1/2> <cid> <timeout>: Stop/Start/State data call.\n");
+ printf("data_call <0/1/2> <cid> <auto_boot_call> <def_route> <as_dns>: Stop/Start/State data call.\n");
printf("call: Call the phone number.\n");
printf("answer: Answer the phone call.\n");
printf("hangup: Hang up all phone call. No id.\n");
@@ -654,19 +654,22 @@
mbtk_apn_info_t apn;
memset(&apn, 0, sizeof(mbtk_apn_info_t));
#if 1
- int cid, ip_type, auto_save, auto_boot_call;
- int count = sscanf(cmd, "apn %d %d %d %d %s",
- &cid, &ip_type, &auto_save, &auto_boot_call, apn.apn);
+ int cid, ip_type, auto_save, auto_boot_call, def_route, as_dns;
+ int count = sscanf(cmd, "apn %d %d %d %d %d %d %s",
+ &cid, &ip_type, &auto_save, &auto_boot_call,
+ &def_route, &as_dns, apn.apn);
// Delete APN
if(strcmp(apn.apn,"null") == 0 || strcmp(apn.apn,"NULL") == 0) {
memset(apn.apn, 0, sizeof(apn.apn));
}
- if(count == 5) {
+ if(count == 7) {
apn.cid = (mbtk_ril_cid_enum)cid;
apn.ip_type = (mbtk_ip_type_enum)ip_type;
apn.auto_save = (uint8)auto_save;
apn.auto_boot_call = (uint8)auto_boot_call;
+ apn.def_route = (uint8)def_route;
+ apn.as_dns = (uint8)as_dns;
}
#else
char *ptr = strstr(cmd, " ");
@@ -698,6 +701,113 @@
}
}
}
+ else if(!strncasecmp(cmd, "data_call", 9)){ // data_call <0/1/2> <cid> <timeout>
+ // mbtk_ril_cid_enum cid, bool auto_boot_call, bool def_route, int retry_interval, int timeout, mbtk_ip_info_t *rsp_info
+ // data_call <0/1/2> <cid> <timeout>
+ int type, cid, auto_boot_call, def_route, as_dns;
+ int count = sscanf(cmd, "data_call %d %d %d %d %d", &type, &cid, &auto_boot_call, &def_route, &as_dns);
+ if(count != 5) {
+ count = sscanf(cmd, "data_call %d %d", &type, &cid);
+ }
+
+ if(count == 5 || count == 2) {
+ mbtk_ip_info_t ip;
+ memset(&ip, 0, sizeof(mbtk_ip_info_t));
+ if(type == MBTK_DATA_CALL_START) {
+ err = mbtk_data_call_start((mbtk_ril_cid_enum)cid, (bool)auto_boot_call, (bool)def_route, (bool)as_dns, 10, 10, &ip);
+ } else if(type == MBTK_DATA_CALL_STOP) {
+ err = mbtk_data_call_stop((mbtk_ril_cid_enum)cid, 10);
+ } else {
+ err = mbtk_data_call_state_get((mbtk_ril_cid_enum)cid, &ip);
+ }
+ if(err) {
+ printf("Error : %d\n", err);
+ } else {
+ printf("DATA_CALL success\n");
+ if(type == MBTK_DATA_CALL_START || type == MBTK_DATA_CALL_STATE) {
+ if(ip.ipv4.valid) {
+ // log_hex("IPv4", &ipv4, sizeof(mbtk_ipv4_info_t));
+ char ip_tmp[20];
+
+ memset(ip_tmp, 0, 20);
+ if(inet_ntop(AF_INET, &(ip.ipv4.IPAddr), ip_tmp, 20) == NULL) {
+ printf("IP error.\n");
+ } else {
+ printf("IP : %s\n", ip_tmp);
+ }
+
+ memset(ip_tmp, 0, 20);
+ if(inet_ntop(AF_INET, &(ip.ipv4.PrimaryDNS), ip_tmp, 20) == NULL) {
+ printf("PrimaryDNS error.\n");
+ } else {
+ printf("PrimaryDNS : %s\n", ip_tmp);
+ }
+
+ memset(ip_tmp, 0, 20);
+ if(inet_ntop(AF_INET, &(ip.ipv4.SecondaryDNS), ip_tmp, 20) == NULL) {
+ printf("SecondaryDNS error.\n");
+ } else {
+ printf("SecondaryDNS : %s\n", ip_tmp);
+ }
+
+ memset(ip_tmp, 0, 20);
+ if(inet_ntop(AF_INET, &(ip.ipv4.GateWay), ip_tmp, 20) == NULL) {
+ printf("GateWay error.\n");
+ } else {
+ printf("GateWay : %s\n", ip_tmp);
+ }
+
+ memset(ip_tmp, 0, 20);
+ if(inet_ntop(AF_INET, &(ip.ipv4.NetMask), ip_tmp, 20) == NULL) {
+ printf("NetMask error.\n");
+ } else {
+ printf("NetMask : %s\n", ip_tmp);
+ }
+ }
+
+ if(ip.ipv6.valid) {
+ // log_hex("IPv6", &ipv6, sizeof(mbtk_ipv6_info_t));
+ char ip_tmp[50];
+
+ memset(ip_tmp, 0, 50);
+ if(ipv6_2_str(&(ip.ipv6.IPV6Addr), ip_tmp)) {
+ printf("IP error.\n");
+ } else {
+ printf("IP : %s\n", ip_tmp);
+ }
+
+ memset(ip_tmp, 0, 50);
+ if(ipv6_2_str(&(ip.ipv6.PrimaryDNS), ip_tmp)) {
+ printf("PrimaryDNS error.\n");
+ } else {
+ printf("PrimaryDNS : %s\n", ip_tmp);
+ }
+
+ memset(ip_tmp, 0, 50);
+ if(ipv6_2_str(&(ip.ipv6.SecondaryDNS), ip_tmp)) {
+ printf("SecondaryDNS error.\n");
+ } else {
+ printf("SecondaryDNS : %s\n", ip_tmp);
+ }
+
+ memset(ip_tmp, 0, 50);
+ if(ipv6_2_str(&(ip.ipv6.GateWay), ip_tmp)) {
+ printf("GateWay error.\n");
+ } else {
+ printf("GateWay : %s\n", ip_tmp);
+ }
+
+ memset(ip_tmp, 0, 50);
+ if(ipv6_2_str(&(ip.ipv6.NetMask), ip_tmp)) {
+ printf("NetMask error.\n");
+ } else {
+ printf("NetMask : %s\n", ip_tmp);
+ }
+ }
+ }
+ }
+ }
+ }
else if(!strncasecmp(cmd, "cell", 4)){
char *ptr = strstr(cmd, ","); //CPMS,ME,ME,ME
if(ptr == NULL)
@@ -1262,124 +1372,6 @@
printf("Time type:%d.\n", time_type);
}
}
- } else if(!strncasecmp(cmd, "data_call", 9)){ // data_call <0/1/2> <cid> <timeout>
- // data_call <0/1/2> <cid> <timeout>
- char *ptr = strstr(cmd, " ");
- if(ptr == NULL)
- continue;
- while(*ptr != '\0' && *ptr == ' ')
- ptr++;
- mbtk_data_call_type_enum type = (mbtk_data_call_type_enum)atoi(ptr);
-
- ptr = strstr(ptr, " ");
- if(ptr == NULL)
- continue;
- while(*ptr != '\0' && *ptr == ' ')
- ptr++;
- int cid = atoi(ptr);
-
- ptr = strstr(ptr, " ");
- if(ptr == NULL)
- continue;
- while(*ptr != '\0' && *ptr == ' ')
- ptr++;
- int timeout = atoi(ptr);
-
- if(type == MBTK_DATA_CALL_START) {
- err = mbtk_data_call_start(info_handle, cid, 0, FALSE, timeout);
- } else if(type == MBTK_DATA_CALL_STOP) {
- err = mbtk_data_call_stop(info_handle, cid, timeout);
- } else {
- mbtk_ipv4_info_t ipv4;
- mbtk_ipv6_info_t ipv6;
- err = mbtk_data_call_state_get(info_handle, cid, &ipv4, &ipv6);
- if(!err) {
- if(ipv4.valid) {
- // log_hex("IPv4", &ipv4, sizeof(mbtk_ipv4_info_t));
- char ip_tmp[20];
-
- memset(ip_tmp, 0, 20);
- if(inet_ntop(AF_INET, &(ipv4.IPAddr), ip_tmp, 20) == NULL) {
- printf("IP error.\n");
- } else {
- printf("IP : %s\n", ip_tmp);
- }
-
- memset(ip_tmp, 0, 20);
- if(inet_ntop(AF_INET, &(ipv4.PrimaryDNS), ip_tmp, 20) == NULL) {
- printf("PrimaryDNS error.\n");
- } else {
- printf("PrimaryDNS : %s\n", ip_tmp);
- }
-
- memset(ip_tmp, 0, 20);
- if(inet_ntop(AF_INET, &(ipv4.SecondaryDNS), ip_tmp, 20) == NULL) {
- printf("SecondaryDNS error.\n");
- } else {
- printf("SecondaryDNS : %s\n", ip_tmp);
- }
-
- memset(ip_tmp, 0, 20);
- if(inet_ntop(AF_INET, &(ipv4.GateWay), ip_tmp, 20) == NULL) {
- printf("GateWay error.\n");
- } else {
- printf("GateWay : %s\n", ip_tmp);
- }
-
- memset(ip_tmp, 0, 20);
- if(inet_ntop(AF_INET, &(ipv4.NetMask), ip_tmp, 20) == NULL) {
- printf("NetMask error.\n");
- } else {
- printf("NetMask : %s\n", ip_tmp);
- }
- }
-
- if(ipv6.valid) {
- // log_hex("IPv6", &ipv6, sizeof(mbtk_ipv6_info_t));
- char ip_tmp[50];
-
- memset(ip_tmp, 0, 50);
- if(ipv6_2_str(&(ipv6.IPV6Addr), ip_tmp)) {
- printf("IP error.\n");
- } else {
- printf("IP : %s\n", ip_tmp);
- }
-
- memset(ip_tmp, 0, 50);
- if(ipv6_2_str(&(ipv6.PrimaryDNS), ip_tmp)) {
- printf("PrimaryDNS error.\n");
- } else {
- printf("PrimaryDNS : %s\n", ip_tmp);
- }
-
- memset(ip_tmp, 0, 50);
- if(ipv6_2_str(&(ipv6.SecondaryDNS), ip_tmp)) {
- printf("SecondaryDNS error.\n");
- } else {
- printf("SecondaryDNS : %s\n", ip_tmp);
- }
-
- memset(ip_tmp, 0, 50);
- if(ipv6_2_str(&(ipv6.GateWay), ip_tmp)) {
- printf("GateWay error.\n");
- } else {
- printf("GateWay : %s\n", ip_tmp);
- }
-
- memset(ip_tmp, 0, 50);
- if(ipv6_2_str(&(ipv6.NetMask), ip_tmp)) {
- printf("NetMask error.\n");
- } else {
- printf("NetMask : %s\n", ip_tmp);
- }
- }
- }
- }
- if(err) {
- printf("Error : %d\n", err);
- } else {
- printf("DATA_CALL success\n");
- }
}
#endif
else if(!strcasecmp(cmd, "h") || !strcasecmp(cmd, "help")) {