zhao/QModem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add -D option to block modification of resolve.conf to fix #10

Browse Source
This commit is contained in:
fujr 2024-12-19 19:16:54 +08:00
parent 63a8758277
commit 0545d9e480
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/quectel_CM_5G_M/src/QMIThread.h
View File

@ -203,6 +203,7 @@ typedef struct __PROFILE {
bool enable_ipv4; bool enable_ipv4;
bool enable_ipv6; bool enable_ipv6;
bool no_dhcp; bool no_dhcp;
bool no_dns;
const char *logfile; const char *logfile;
const char *usblogfile; const char *usblogfile;
char expect_adapter[32]; char expect_adapter[32];

5
application/quectel_CM_5G_M/src/main.c
View File

@ -251,6 +251,7 @@ static int usage(const char *progname) {
dbg_time("-b Enable network interface bridge function (default 0)"); dbg_time("-b Enable network interface bridge function (default 0)");
dbg_time("-v Verbose log mode, for debug purpose."); dbg_time("-v Verbose log mode, for debug purpose.");
dbg_time("-d Obtain the IP address and dns through qmi"); dbg_time("-d Obtain the IP address and dns through qmi");
dbg_time("-D Do not Append DNS servers to /etc/resolv.conf");
dbg_time("-M metric Specify the metric of the default route"); dbg_time("-M metric Specify the metric of the default route");
dbg_time("[Examples]"); dbg_time("[Examples]");
dbg_time("Example 1: %s ", progname); dbg_time("Example 1: %s ", progname);
@ -917,6 +918,10 @@ static int parse_user_input(int argc, char **argv, PROFILE_T *profile) {
} }
break; break;
case 'D':
profile->no_dns = 1;
break;
default: default:
return usage(argv[0]); return usage(argv[0]);
break; break;

22
application/quectel_CM_5G_M/src/udhcpc.c
View File

@ -305,7 +305,7 @@ void update_ipv6_address(const char *ifname, const char *ip, const char *gw, uns
} }
} }
static void update_ip_address_by_qmi(const char *ifname, const IPV4_T *ipv4, const IPV6_T *ipv6, char *m) { static void update_ip_address_by_qmi(const char *ifname, const IPV4_T *ipv4, const IPV6_T *ipv6, PROFILE_T *profile) {
char *d1, *d2; char *d1, *d2;
if (ipv4 && ipv4->Address) { if (ipv4 && ipv4->Address) {
@ -320,11 +320,11 @@ static void update_ip_address_by_qmi(const char *ifname, const IPV4_T *ipv4, con
} }
} }
update_ipv4_address(ifname, d1, d2, prefix,m); update_ipv4_address(ifname, d1, d2, prefix,profile->metric);
free(d1); free(d2); free(d1); free(d2);
//Adding DNS //Adding DNS
if (ipv4->DnsPrimary) { if (ipv4->DnsPrimary && !profile->no_dns) {
d1 = strdup(ipv4Str(ipv4->DnsPrimary)); d1 = strdup(ipv4Str(ipv4->DnsPrimary));
d2 = strdup(ipv4Str(ipv4->DnsSecondary ? ipv4->DnsSecondary : ipv4->DnsPrimary)); d2 = strdup(ipv4Str(ipv4->DnsSecondary ? ipv4->DnsSecondary : ipv4->DnsPrimary));
update_resolv_conf(4, ifname, d1, d2); update_resolv_conf(4, ifname, d1, d2);
@ -336,11 +336,11 @@ static void update_ip_address_by_qmi(const char *ifname, const IPV4_T *ipv4, con
d1 = strdup(ipv6Str(ipv6->Address)); d1 = strdup(ipv6Str(ipv6->Address));
d2 = strdup(ipv6Str(ipv6->Gateway)); d2 = strdup(ipv6Str(ipv6->Gateway));
update_ipv6_address(ifname, d1, d2, ipv6->PrefixLengthIPAddr,m); update_ipv6_address(ifname, d1, d2, ipv6->PrefixLengthIPAddr,profile->metric);
free(d1); free(d2); free(d1); free(d2);
//Adding DNS //Adding DNS
if (ipv6->DnsPrimary[0]) { if (ipv6->DnsPrimary[0] && !profile->no_dns) {
d1 = strdup(ipv6Str(ipv6->DnsPrimary)); d1 = strdup(ipv6Str(ipv6->DnsPrimary));
d2 = strdup(ipv6Str(ipv6->DnsSecondary[0] ? ipv6->DnsSecondary : ipv6->DnsPrimary)); d2 = strdup(ipv6Str(ipv6->DnsSecondary[0] ? ipv6->DnsSecondary : ipv6->DnsPrimary));
update_resolv_conf(6, ifname, d1, d2); update_resolv_conf(6, ifname, d1, d2);
@ -523,7 +523,7 @@ void udhcpc_start(PROFILE_T *profile) {
#if 0 #if 0
if (profile->rawIP != 0) //mdm9x07/ec25,ec20 R2.0 if (profile->rawIP != 0) //mdm9x07/ec25,ec20 R2.0
{ {
update_ip_address_by_qmi(ifname, &profile->ipv4, profile->ipv6, &profile->metric); update_ip_address_by_qmi(ifname, &profile->ipv4, profile->ipv6, profile);
return; return;
} }
#endif #endif
@ -532,7 +532,7 @@ void udhcpc_start(PROFILE_T *profile) {
goto set_ipv6; goto set_ipv6;
if (profile->no_dhcp || profile->request_ops == &mbim_request_ops) { //lots of mbim modem do not support DHCP if (profile->no_dhcp || profile->request_ops == &mbim_request_ops) { //lots of mbim modem do not support DHCP
update_ip_address_by_qmi(ifname, &profile->ipv4, NULL, profile->metric); update_ip_address_by_qmi(ifname, &profile->ipv4, NULL, profile);
} }
else else
/* Do DHCP using busybox tools */ /* Do DHCP using busybox tools */
@ -604,7 +604,7 @@ void udhcpc_start(PROFILE_T *profile) {
if (!ql_netcard_ipv4_address_check(ifname, qmi2addr(profile->ipv4.Address))) { if (!ql_netcard_ipv4_address_check(ifname, qmi2addr(profile->ipv4.Address))) {
//no udhcpc's default.script exist, directly set ip and dns //no udhcpc's default.script exist, directly set ip and dns
update_ip_address_by_qmi(ifname, &profile->ipv4, NULL, profile->metric); update_ip_address_by_qmi(ifname, &profile->ipv4, NULL, profile);
} }
//Add by Demon. check default route //Add by Demon. check default route
FILE *rt_fp = NULL; FILE *rt_fp = NULL;
@ -655,7 +655,7 @@ set_ipv6:
close(forward_fd); close(forward_fd);
} }
update_ip_address_by_qmi(ifname, NULL, &profile->ipv6, profile->metric); update_ip_address_by_qmi(ifname, NULL, &profile->ipv6, profile);
if (profile->ipv6.DnsPrimary[0] || profile->ipv6.DnsSecondary[0]) { if (profile->ipv6.DnsPrimary[0] || profile->ipv6.DnsSecondary[0]) {
char dns1str[64], dns2str[64]; char dns1str[64], dns2str[64];
@ -667,8 +667,8 @@ set_ipv6:
if (profile->ipv6.DnsSecondary[0]) { if (profile->ipv6.DnsSecondary[0]) {
strcpy(dns2str, ipv6Str(profile->ipv6.DnsSecondary)); strcpy(dns2str, ipv6Str(profile->ipv6.DnsSecondary));
} }
if (!profile->no_dns)
update_resolv_conf(6, ifname, profile->ipv6.DnsPrimary[0] ? dns1str : NULL, update_resolv_conf(6, ifname, profile->ipv6.DnsPrimary[0] ? dns1str : NULL,
profile->ipv6.DnsSecondary[0] != '\0' ? dns2str : NULL); profile->ipv6.DnsSecondary[0] != '\0' ? dns2str : NULL);
} }