Update
This commit is contained in:
Binary file not shown.
+181
-71
@@ -9,6 +9,7 @@
|
||||
#include <string.h>
|
||||
#include <signal.h>
|
||||
#include <unistd.h>
|
||||
#include <time.h>
|
||||
#include <fcntl.h>
|
||||
#include <net/if.h> /* if_nametoindex */
|
||||
#include <linux/if_ether.h>
|
||||
@@ -17,8 +18,12 @@
|
||||
|
||||
#include "common.h"
|
||||
|
||||
/* Global variables */
|
||||
static struct arguments arguments;
|
||||
static int running = 1;
|
||||
static FILE *f;
|
||||
static char hostname[127];
|
||||
|
||||
|
||||
struct arguments {
|
||||
char *interface;
|
||||
@@ -216,13 +221,38 @@ static char *mapType(const int type){
|
||||
return tmp;
|
||||
}
|
||||
|
||||
/*
|
||||
* This function get the localtime into the rsyslog format
|
||||
*/
|
||||
static int syslog_time(time_t ts, char t[32], size_t l){
|
||||
const char format[] = "%b %d %T";
|
||||
struct tm *lt = localtime(&ts);
|
||||
if(strftime(t, l, format, lt) == 0)
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
static void get_hostname(){
|
||||
/* Get the hostname */
|
||||
if (gethostname(hostname, 127) == -1){
|
||||
printf("Failed to get the hostname\n");
|
||||
strncpy(hostname, "ubuntu", 7);
|
||||
}
|
||||
}
|
||||
/*
|
||||
* This function print to the stdout the query section
|
||||
*/
|
||||
static void print_query(struct event *s_event){
|
||||
char *req_type, *class, *type;
|
||||
char t[32];
|
||||
time_t ts = time(NULL);
|
||||
syslog_time(ts, t, sizeof(t));
|
||||
printf("%-20s", t);
|
||||
|
||||
req_type = mapReqType(s_event->req_type);
|
||||
printf("%s ", req_type);
|
||||
free(req_type);
|
||||
|
||||
printf("%5s:%d\t\t", inet_ntoa(*(struct in_addr*)&s_event->client), s_event->dport);
|
||||
printf("%5s:%d\t", inet_ntoa(*(struct in_addr*)&s_event->client), s_event->dport);
|
||||
printf("%x\t", s_event->tid);
|
||||
|
||||
class = mapClass(s_event->class);
|
||||
@@ -235,6 +265,53 @@ static void print_query(struct event *s_event){
|
||||
|
||||
printf("%s", s_event->qname);
|
||||
}
|
||||
/*
|
||||
* This function save to log file the query section in rsylog format
|
||||
* <time> <hostname> <procname>: <info> <data>
|
||||
*/
|
||||
static void query_to_log(struct event *s_event){
|
||||
char t[32];
|
||||
time_t ts = time(NULL);
|
||||
char *req_type, *class, *type;
|
||||
char tid[12];
|
||||
char src[40];
|
||||
char s_class[16], s_type[16];
|
||||
|
||||
if (syslog_time(ts, t, sizeof(t)) == 0)
|
||||
fwrite(t, strlen(t), 1, f);
|
||||
|
||||
fwrite(" ", 1, 1, f);
|
||||
fwrite(hostname, strlen(hostname), 1, f);
|
||||
|
||||
fwrite(" dns-trace: ", 12, 1, f);
|
||||
fwrite("<info> ", 7, 1, f);
|
||||
|
||||
req_type = mapReqType(s_event->req_type);
|
||||
fwrite(req_type, strlen(req_type), 1, f);
|
||||
free(req_type);
|
||||
fwrite(";", 1, 1, f);
|
||||
|
||||
snprintf(tid, 12, "tid=%x;", s_event->tid);
|
||||
fwrite(tid, strlen(tid), 1, f);
|
||||
|
||||
snprintf(src, 40, "%s:%d;", inet_ntoa(*(struct in_addr*)&s_event->client), s_event->dport);
|
||||
fwrite(src, strlen(src), 1, f);
|
||||
|
||||
class = mapClass(s_event->class);
|
||||
snprintf(s_class, 16, "class=%s;", class);
|
||||
fwrite(s_class, strlen(s_class), 1, f);
|
||||
free(class);
|
||||
|
||||
type = mapType(s_event->type);
|
||||
snprintf(s_type, 16, "type=%s;", type);
|
||||
fwrite(s_type, strlen(s_type), 1, f);
|
||||
free(type);
|
||||
|
||||
fwrite("\n", 1, 1, f);
|
||||
}
|
||||
/*
|
||||
* This function get labels from DNS answer
|
||||
*/
|
||||
static void get_labels(unsigned char *buf, char *qname){
|
||||
int pos = 0;
|
||||
while (*buf++ != '\0') {
|
||||
@@ -248,93 +325,111 @@ static void get_labels(unsigned char *buf, char *qname){
|
||||
}
|
||||
qname[pos - 1] = '\0';
|
||||
}
|
||||
static void print_answer_hdr(struct event *s_event, int *pos, uint16_t *type, uint16_t *size, uint16_t *class, uint32_t *ttl){
|
||||
int p = *pos;
|
||||
uint16_t msg = s_event->buf[p++];
|
||||
msg |= s_event->buf[p++] << 8;
|
||||
// printf("%x\n", ntohs(msg));
|
||||
/*
|
||||
* This function save to rsyslog format the answer section
|
||||
*/
|
||||
static void answer_to_log(struct event *s_event){
|
||||
|
||||
}
|
||||
/*
|
||||
* This function print to the stdout the answer section
|
||||
*/
|
||||
static void print_answer(struct event *s_event){
|
||||
char *req_type;
|
||||
req_type = mapReqType(s_event->req_type);
|
||||
printf("%s ", req_type);
|
||||
free(req_type);
|
||||
int pos = 0;
|
||||
char t[32];
|
||||
time_t ts = time(NULL);
|
||||
|
||||
printf("%5s:%5d\t", inet_ntoa(*(struct in_addr*)&s_event->client), s_event->dport);
|
||||
printf("%x\t", s_event->tid);
|
||||
for (int i = 0; i < s_event->numAns; i++){
|
||||
uint16_t type, class, size;
|
||||
char *s_type, *s_class;
|
||||
uint32_t ttl;
|
||||
uint16_t msg = s_event->buf[pos++];
|
||||
msg |= s_event->buf[pos++] << 8;
|
||||
|
||||
*type = s_event->buf[p++];
|
||||
*type |= s_event->buf[p++] << 8;
|
||||
/* Print answer hdr */
|
||||
syslog_time(ts, t, sizeof(t));
|
||||
printf("%-20s", t);
|
||||
|
||||
*class = s_event->buf[p++];
|
||||
*class |= s_event->buf[p++] << 8;
|
||||
req_type = mapReqType(s_event->req_type);
|
||||
printf("%s ", req_type);
|
||||
free(req_type);
|
||||
|
||||
*ttl = s_event->buf[p++];
|
||||
*ttl |= s_event->buf[p++] << 8;
|
||||
*ttl |= s_event->buf[p++] << 16;
|
||||
*ttl |= s_event->buf[p++] << 24;
|
||||
printf("%5s:%5d\t", inet_ntoa(*(struct in_addr*)&s_event->client), s_event->dport);
|
||||
printf("%x\t", s_event->tid);
|
||||
|
||||
*size = s_event->buf[p++];
|
||||
*size |= s_event->buf[p++] << 8;
|
||||
type = s_event->buf[pos++];
|
||||
type |= s_event->buf[pos++] << 8;
|
||||
|
||||
*type = ntohs(*type);
|
||||
*class = ntohs(*class);
|
||||
*ttl = ntohl(*ttl);
|
||||
*size = ntohs(*size);
|
||||
class = s_event->buf[pos++];
|
||||
class |= s_event->buf[pos++] << 8;
|
||||
|
||||
*pos = p;
|
||||
ttl = s_event->buf[pos++];
|
||||
ttl |= s_event->buf[pos++] << 8;
|
||||
ttl |= s_event->buf[pos++] << 16;
|
||||
ttl |= s_event->buf[pos++] << 24;
|
||||
|
||||
size = s_event->buf[pos++];
|
||||
size |= s_event->buf[pos++] << 8;
|
||||
|
||||
type = ntohs(type);
|
||||
class = ntohs(class);
|
||||
ttl = ntohl(ttl);
|
||||
size = ntohs(size);
|
||||
|
||||
/* Print answer data */
|
||||
s_class = mapClass(class);
|
||||
printf("%-5s", s_class);
|
||||
free(s_class);
|
||||
|
||||
s_type = mapType(type);
|
||||
printf("%s\t", s_type);
|
||||
free(s_type);
|
||||
|
||||
if (type == 1) { // -> A
|
||||
uint32_t ip = s_event->buf[pos] + (s_event->buf[pos+1] << 8) + (s_event->buf[pos+2] << 16) + (s_event->buf[pos+3] << 24);
|
||||
printf("%s %5d", inet_ntoa(*(struct in_addr*)&ip), ttl);
|
||||
}
|
||||
if (type == 5) { // -> CNAME
|
||||
char cname[size];
|
||||
get_labels(s_event->buf + pos, cname);
|
||||
printf("%s %d ", cname, ttl);
|
||||
}
|
||||
if (type == 28){ // -> AAAA
|
||||
for (int i = 0; i < size; i++){
|
||||
if (i % 2 == 0)
|
||||
printf("%x", s_event->buf[pos]);
|
||||
else{
|
||||
if (i < (size - 1))
|
||||
printf("%x:", s_event->buf[pos]);
|
||||
else
|
||||
printf("%x", s_event->buf[pos]);
|
||||
}
|
||||
pos++;
|
||||
}
|
||||
printf(" %d ", ttl);
|
||||
}
|
||||
pos += size;
|
||||
printf("\n");
|
||||
}
|
||||
}
|
||||
int handle_event(void *ctx, void *data, size_t data_sz){
|
||||
struct event *s_event = (struct event*)data;
|
||||
if (s_event->req_type == REQ_QUERY){
|
||||
print_query(s_event);
|
||||
if (arguments.to_output == 1)
|
||||
print_query(s_event);
|
||||
if (arguments.filename != NULL && f != NULL)
|
||||
query_to_log(s_event);
|
||||
}
|
||||
if (s_event->req_type == REQ_ANSWER){
|
||||
int pos = 0;
|
||||
for (int i = 0; i < s_event->numAns; i++){
|
||||
// print_query(s_event);
|
||||
uint16_t type, size, class;
|
||||
uint32_t ttl;
|
||||
char *s_type, *s_class;
|
||||
print_answer_hdr(s_event, &pos, &type, &size, &class, &ttl);
|
||||
|
||||
s_class = mapClass(class);
|
||||
printf("%-5s", s_class);
|
||||
free(s_class);
|
||||
|
||||
s_type = mapType(type);
|
||||
printf("%s\t", s_type);
|
||||
free(s_type);
|
||||
|
||||
if (type == 1) { // -> A
|
||||
uint32_t ip = s_event->buf[pos] + (s_event->buf[pos+1] << 8) + (s_event->buf[pos+2] << 16) + (s_event->buf[pos+3] << 24);
|
||||
printf("%s %5d", inet_ntoa(*(struct in_addr*)&ip), ttl);
|
||||
}
|
||||
if (type == 5) { // -> CNAME
|
||||
char cname[size];
|
||||
get_labels(s_event->buf + pos, cname);
|
||||
printf("%s %d ", cname, ttl);
|
||||
}
|
||||
if (type == 28){ // -> AAAA
|
||||
int p = 0;
|
||||
for (int i = 0; i < size; i++){
|
||||
if (i % 2 == 0)
|
||||
printf("%x", s_event->buf[pos + p++]);
|
||||
else{
|
||||
if (i < (size - 1))
|
||||
printf("%x:", s_event->buf[pos + p++]);
|
||||
else
|
||||
printf("%x", s_event->buf[pos + p++]);
|
||||
}
|
||||
}
|
||||
printf(" %d ", ttl);
|
||||
}
|
||||
pos += size;
|
||||
printf("\n");
|
||||
}
|
||||
if (arguments.to_output == 1)
|
||||
print_answer(s_event);
|
||||
if (arguments.filename != NULL && f != NULL)
|
||||
answer_to_log(s_event);
|
||||
}
|
||||
|
||||
printf("\n");
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
int main(int argc, char *argv[]){
|
||||
@@ -349,7 +444,7 @@ int main(int argc, char *argv[]){
|
||||
arguments = parse_args(argc, argv); // Parsing arguments
|
||||
|
||||
if (arguments.interface == NULL){
|
||||
printf("You must specified the interface name");
|
||||
printf("You must specified the interface name\n");
|
||||
exit(-1);
|
||||
}
|
||||
printf("Listen to %s\n", arguments.interface);
|
||||
@@ -360,6 +455,15 @@ int main(int argc, char *argv[]){
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
if (arguments.filename != NULL){
|
||||
f = fopen(arguments.filename, "a");
|
||||
if (f == NULL){
|
||||
printf("Failed to create the file %s\n", arguments.filename);
|
||||
return -1;
|
||||
}
|
||||
printf("Save to %s\n", arguments.filename);
|
||||
}
|
||||
|
||||
signal(SIGINT, signalHandler);
|
||||
|
||||
/* Open and load our eBPF object */
|
||||
@@ -397,6 +501,9 @@ int main(int argc, char *argv[]){
|
||||
|
||||
setsockopt(sock, SOL_SOCKET, SO_ATTACH_BPF, &prog_fd, sizeof(int));
|
||||
|
||||
/* Get the hostname of the system */
|
||||
get_hostname();
|
||||
|
||||
/* Start the ringbuffer */
|
||||
rb = ring_buffer__new(fd_map_data, handle_event, NULL, NULL);
|
||||
if (!rb){
|
||||
@@ -414,6 +521,9 @@ int main(int argc, char *argv[]){
|
||||
}
|
||||
}
|
||||
|
||||
if (f != NULL)
|
||||
fclose(f);
|
||||
|
||||
ring_buffer__free(rb);
|
||||
bpf_object__close(obj);
|
||||
|
||||
|
||||
@@ -247,7 +247,7 @@ static void dnsanswer(struct __sk_buff *skb, struct iphdr ip, struct udphdr udp,
|
||||
struct dnshdr dns;
|
||||
uint32_t offset = sizeof(struct ethhdr) + sizeof(struct iphdr) + sizeof(struct udphdr);
|
||||
size_t tlen = ntohs(udp.len);
|
||||
int index = 0;
|
||||
unsigned int index = 0U;
|
||||
|
||||
if (tlen < 0 || tlen >= 256)
|
||||
return;
|
||||
@@ -297,13 +297,12 @@ static void dnsanswer(struct __sk_buff *skb, struct iphdr ip, struct udphdr udp,
|
||||
* otherwise, I have an issue with the eBPF verifier
|
||||
*/
|
||||
offset += sizeof(struct dnshdr) + query_len;
|
||||
while (index < tlen){
|
||||
//while (index < tlen){
|
||||
for (index = 0; index < tlen || index == MAX_UDP_PAYLOAD; index++) {
|
||||
bpf_skb_load_bytes(skb, offset + index, s_event->buf + index, 1);
|
||||
index++;
|
||||
// index++;
|
||||
}
|
||||
bpf_ringbuf_submit(s_event, 0);
|
||||
//if(bpf_skb_load_bytes(skb, offset, &buf, tlen) < 0)
|
||||
// bpf_printk("Failed");
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user