scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-11-01 10:57:47 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

ucentral-tools: format dnsprobe.c with clang-format

Browse Source 
Apply clang-format and fix code quality issues found by cppcheck:
- Consistent pointer style
- Standardise indentation and brace style
- Improve code readability

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2025-10-19 00:00:00 +02:00
parent 190bccf588
commit 31a2888b77
1 changed files with 211 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
feeds/ucentral/ucentral-tools/src/dnsprobe.c
View File

@@ -48,18 +48,18 @@
// usage: "Name: debian\n" // usage: "Name: debian\n"
// usage: "Address: 127.0.0.1\n" // usage: "Address: 127.0.0.1\n"
#include <stdio.h>
#include <resolv.h>
#include <string.h>
#include <errno.h>
#include <time.h>
#include <poll.h>
#include <unistd.h>
#include <stdlib.h>
#include <sys/socket.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h>
#include <net/if.h> #include <net/if.h>
#include <netdb.h> #include <netdb.h>
#include <poll.h>
#include <resolv.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/socket.h>
#include <time.h>
#include <unistd.h>
#include <libubox/ulog.h> #include <libubox/ulog.h>
@@ -91,37 +91,22 @@ struct query {
int rcode, n_ns; int rcode, n_ns;
}; };
static const char *rcodes[] = { static const char *rcodes[] = { "NOERROR", "FORMERR", "SERVFAIL", "NXDOMAIN",
"NOERROR", "NOTIMP", "REFUSED", "YXDOMAIN", "YXRRSET",
"FORMERR", "NXRRSET", "NOTAUTH", "NOTZONE", "RESERVED11",
"SERVFAIL", "RESERVED12", "RESERVED13", "RESERVED14", "RESERVED15",
"NXDOMAIN", "BADVERS" };
"NOTIMP",
"REFUSED",
"YXDOMAIN",
"YXRRSET",
"NXRRSET",
"NOTAUTH",
"NOTZONE",
"RESERVED11",
"RESERVED12",
"RESERVED13",
"RESERVED14",
"RESERVED15",
"BADVERS"
};
static unsigned int default_port = 53; static unsigned int default_port = 53;
static unsigned int default_retry = 1; static unsigned int default_retry = 1;
static unsigned int default_timeout = 2; static unsigned int default_timeout = 2;
static int parse_reply(const unsigned char *msg, size_t len, int *bb_style_counter) static int parse_reply(const unsigned char *msg, size_t len)
{ {
ns_msg handle; ns_msg handle;
ns_rr rr; ns_rr rr;
int i, n, rdlen; int i, n, rdlen;
const char *format = NULL;
char astr[INET6_ADDRSTRLEN], dname[MAXDNAME]; char astr[INET6_ADDRSTRLEN], dname[MAXDNAME];
const unsigned char *cp; const unsigned char *cp;
@@ -132,14 +117,14 @@ static int parse_reply(const unsigned char *msg, size_t len, int *bb_style_count
for (i = 0; i < ns_msg_count(handle, ns_s_an); i++) { for (i = 0; i < ns_msg_count(handle, ns_s_an); i++) {
if (ns_parserr(&handle, ns_s_an, i, &rr) != 0) { if (ns_parserr(&handle, ns_s_an, i, &rr) != 0) {
//fprintf(stderr, "Unable to parse resource record: %s\n", strerror(errno)); // fprintf(stderr, "Unable to parse resource record: %s\n",
// strerror(errno));
return -1; return -1;
} }
rdlen = ns_rr_rdlen(rr); rdlen = ns_rr_rdlen(rr);
switch (ns_rr_type(rr)) switch (ns_rr_type(rr)) {
{
case ns_t_a: case ns_t_a:
if (rdlen != 4) { if (rdlen != 4) {
// fprintf(stderr, "Unexpected A record length\n"); // fprintf(stderr, "Unexpected A record length\n");
@@ -161,24 +146,33 @@ static int parse_reply(const unsigned char *msg, size_t len, int *bb_style_count
#endif #endif
case ns_t_ns: case ns_t_ns:
if (!format)
format = "%s\tnameserver = %s\n";
/* fall through */
case ns_t_cname:
if (!format)
format = "%s\tcanonical name = %s\n";
/* fall through */
case ns_t_ptr:
if (!format)
format = "%s\tname = %s\n";
if (ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle), if (ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle),
ns_rr_rdata(rr), dname, sizeof(dname)) < 0) { ns_rr_rdata(rr), dname, sizeof(dname)) < 0) {
//fprintf(stderr, "Unable to uncompress domain: %s\n", strerror(errno)); // fprintf(stderr, "Unable to uncompress domain: %s\n",
// strerror(errno));
return -1; return -1;
} }
printf(format, ns_rr_name(rr), dname); printf("%s\tnameserver = %s\n", ns_rr_name(rr), dname);
break;
case ns_t_cname:
if (ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle),
ns_rr_rdata(rr), dname, sizeof(dname)) < 0) {
// fprintf(stderr, "Unable to uncompress domain: %s\n",
// strerror(errno));
return -1;
}
printf("%s\tcanonical name = %s\n", ns_rr_name(rr), dname);
break;
case ns_t_ptr:
if (ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle),
ns_rr_rdata(rr), dname, sizeof(dname)) < 0) {
// fprintf(stderr, "Unable to uncompress domain: %s\n",
// strerror(errno));
return -1;
}
printf("%s\tname = %s\n", ns_rr_name(rr), dname);
break; break;
case ns_t_mx: case ns_t_mx:
@@ -188,8 +182,10 @@ static int parse_reply(const unsigned char *msg, size_t len, int *bb_style_count
} }
n = ns_get16(ns_rr_rdata(rr)); n = ns_get16(ns_rr_rdata(rr));
if (ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle), if (ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle),
ns_rr_rdata(rr) + 2, dname, sizeof(dname)) < 0) { ns_rr_rdata(rr) + 2, dname,
//fprintf(stderr, "Cannot uncompress MX domain: %s\n", strerror(errno)); sizeof(dname)) < 0) {
// fprintf(stderr, "Cannot uncompress MX domain: %s\n",
// strerror(errno));
return -1; return -1;
} }
printf("%s\tmail exchanger = %d %s\n", ns_rr_name(rr), n, dname); printf("%s\tmail exchanger = %d %s\n", ns_rr_name(rr), n, dname);
@@ -200,7 +196,7 @@ static int parse_reply(const unsigned char *msg, size_t len, int *bb_style_count
// fprintf(stderr, "TXT record too short\n"); // fprintf(stderr, "TXT record too short\n");
return -1; return -1;
} }
n = *(unsigned char *)ns_rr_rdata(rr); n = *((const unsigned char *) ns_rr_rdata(rr));
if (n > 0) { if (n > 0) {
memset(dname, 0, sizeof(dname)); memset(dname, 0, sizeof(dname));
memcpy(dname, ns_rr_rdata(rr) + 1, n); memcpy(dname, ns_rr_rdata(rr) + 1, n);
@@ -217,22 +213,24 @@ static int parse_reply(const unsigned char *msg, size_t len, int *bb_style_count
printf("%s\n", ns_rr_name(rr)); printf("%s\n", ns_rr_name(rr));
cp = ns_rr_rdata(rr); cp = ns_rr_rdata(rr);
n = ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle), n = ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle), cp,
cp, dname, sizeof(dname)); dname, sizeof(dname));
if (n < 0) { if (n < 0) {
//fprintf(stderr, "Unable to uncompress domain: %s\n", strerror(errno)); // fprintf(stderr, "Unable to uncompress domain: %s\n",
// strerror(errno));
return -1; return -1;
} }
printf("\torigin = %s\n", dname); printf("\torigin = %s\n", dname);
cp += n; cp += n;
n = ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle), n = ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle), cp,
cp, dname, sizeof(dname)); dname, sizeof(dname));
if (n < 0) { if (n < 0) {
//fprintf(stderr, "Unable to uncompress domain: %s\n", strerror(errno)); // fprintf(stderr, "Unable to uncompress domain: %s\n",
// strerror(errno));
return -1; return -1;
} }
@@ -335,11 +333,9 @@ static void to_v4_mapped(len_and_sockaddr *a)
if (a->u.sa.sa_family != AF_INET) if (a->u.sa.sa_family != AF_INET)
return; return;
memcpy(a->u.sin6.sin6_addr.s6_addr + 12, memcpy(a->u.sin6.sin6_addr.s6_addr + 12, &a->u.sin.sin_addr, 4);
&a->u.sin.sin_addr, 4);
memcpy(a->u.sin6.sin6_addr.s6_addr, memcpy(a->u.sin6.sin6_addr.s6_addr, "\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
"\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
a->u.sin6.sin6_family = AF_INET6; a->u.sin6.sin6_family = AF_INET6;
a->u.sin6.sin6_flowinfo = 0; a->u.sin6.sin6_flowinfo = 0;
@@ -356,7 +352,9 @@ static void to_v4_mapped(len_and_sockaddr *a)
static int send_queries(struct ns *ns, int n_ns, struct query *queries, int n_queries) static int send_queries(struct ns *ns, int n_ns, struct query *queries, int n_queries)
{ {
int fd; int fd;
int timeout = default_timeout * 1000, retry_interval, servfail_retry = 0; unsigned long timeout = default_timeout * 1000;
unsigned long retry_interval;
int servfail_retry = 0;
len_and_sockaddr from = {}; len_and_sockaddr from = {};
#if ENABLE_FEATURE_IPV6 #if ENABLE_FEATURE_IPV6
int one = 1; int one = 1;
@@ -436,9 +434,9 @@ static int send_queries(struct ns *ns, int n_ns, struct query *queries, int n_qu
continue; continue;
while (1) { while (1) {
recvlen = recvfrom(fd, queries[next_query].reply, recvlen =
sizeof(queries[next_query].reply), 0, recvfrom(fd, queries[next_query].reply,
&from.u.sa, &from.len); sizeof(queries[next_query].reply), 0, &from.u.sa, &from.len);
/* read error */ /* read error */
if (recvlen < 0) if (recvlen < 0)
@@ -482,7 +480,8 @@ static int send_queries(struct ns *ns, int n_ns, struct query *queries, int n_qu
if (servfail_retry && servfail_retry--) { if (servfail_retry && servfail_retry--) {
ns[nn].failures++; ns[nn].failures++;
sendto(fd, queries[qn].query, queries[qn].qlen, sendto(fd, queries[qn].query, queries[qn].qlen,
MSG_NOSIGNAL, &ns[nn].addr.u.sa, ns[nn].addr.len); MSG_NOSIGNAL, &ns[nn].addr.u.sa,
ns[nn].addr.len);
} }
/* fall through */ /* fall through */
@@ -502,8 +501,7 @@ static int send_queries(struct ns *ns, int n_ns, struct query *queries, int n_qu
next_query++; next_query++;
} }
} } else {
else {
memcpy(queries[qn].reply, queries[next_query].reply, recvlen); memcpy(queries[qn].reply, queries[next_query].reply, recvlen);
} }
@@ -520,10 +518,8 @@ static struct ns *add_ns(struct ns **ns, int *n_ns, const char *addr)
char portstr[sizeof("65535")], *p; char portstr[sizeof("65535")], *p;
len_and_sockaddr a = {}; len_and_sockaddr a = {};
struct ns *tmp; struct ns *tmp;
struct addrinfo *ai, *aip, hints = { struct addrinfo *ai, *aip,
.ai_flags = AI_NUMERICSERV, hints = { .ai_flags = AI_NUMERICSERV, .ai_socktype = SOCK_DGRAM };
.ai_socktype = SOCK_DGRAM
};
if (parse_nsaddr(addr, &a)) { if (parse_nsaddr(addr, &a)) {
/* Maybe we got a domain name, attempt to resolve it using the standard /* Maybe we got a domain name, attempt to resolve it using the standard
@@ -584,8 +580,7 @@ static struct ns *add_ns(struct ns **ns, int *n_ns, const char *addr)
return &(*ns)[(*n_ns)++]; return &(*ns)[(*n_ns)++];
} }
static struct query *add_query(struct query **queries, int *n_queries, static struct query *add_query(struct query **queries, int *n_queries, int type, const char *dname)
int type, const char *dname)
{ {
struct query *tmp; struct query *tmp;
ssize_t qlen; ssize_t qlen;
@@ -597,8 +592,8 @@ static struct query *add_query(struct query **queries, int *n_queries,
memset(&tmp[*n_queries], 0, sizeof(*tmp)); memset(&tmp[*n_queries], 0, sizeof(*tmp));
qlen = res_mkquery(QUERY, dname, C_IN, type, NULL, 0, NULL, qlen = res_mkquery(QUERY, dname, C_IN, type, NULL, 0, NULL, tmp[*n_queries].query,
tmp[*n_queries].query, sizeof(tmp[*n_queries].query)); sizeof(tmp[*n_queries].query));
tmp[*n_queries].qlen = qlen; tmp[*n_queries].qlen = qlen;
tmp[*n_queries].name = dname; tmp[*n_queries].name = dname;
@@ -615,8 +610,8 @@ int main(int argc, char **argv)
int n_ns = 0, n_queries = 0; int n_ns = 0, n_queries = 0;
int c = 0; int c = 0;
char *url = "telecominfraproject.com"; const char *url = "telecominfraproject.com";
char *server = "127.0.0.1"; const char *server = "127.0.0.1";
int v6 = 0; int v6 = 0;
while (1) { while (1) {
@@ -647,8 +642,7 @@ int main(int argc, char **argv)
ulog_open(ULOG_SYSLOG | ULOG_STDIO, LOG_DAEMON, "dnsprobe"); ulog_open(ULOG_SYSLOG | ULOG_STDIO, LOG_DAEMON, "dnsprobe");
ULOG_INFO("attempting to probe dns - %s %s %s\n", ULOG_INFO("attempting to probe dns - %s %s %s\n", url, server, v6 ? "ipv6" : "");
url, server, v6 ? "ipv6" : "");
add_query(&queries, &n_queries, v6 ? T_AAAA : T_A, url); add_query(&queries, &n_queries, v6 ? T_AAAA : T_A, url);
@@ -663,13 +657,12 @@ int main(int argc, char **argv)
} }
if (queries[0].rcode != 0) { if (queries[0].rcode != 0) {
printf("** server can't find %s: %s\n", queries[0].name, printf("** server can't find %s: %s\n", queries[0].name, rcodes[queries[0].rcode]);
rcodes[queries[0].rcode]);
goto out; goto out;
} }
if (queries[0].rlen) { if (queries[0].rlen) {
c = parse_reply(queries[0].reply, queries[0].rlen, NULL); c = parse_reply(queries[0].reply, queries[0].rlen);
} }
if (c == 0) if (c == 0)