mykola/arper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small refactor

Browse source
This commit is contained in:
mykola2312 2024-12-20 15:55:57 +02:00
parent 6b596c72e1
commit add77105af
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
main.c
View file

@ -38,7 +38,7 @@ void print_mac(uint8_t* mac) {
mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
} }
struct linkinterface { typedef struct {
char* if_name; char* if_name;
socklen_t if_len; socklen_t if_len;
@ -47,7 +47,7 @@ struct linkinterface {
int fd; // raw socket int fd; // raw socket
int if_idx; int if_idx;
}; } linkinterface_t;
typedef struct { typedef struct {
uint16_t id; uint16_t id;
@ -74,8 +74,8 @@ void frame_free(frame_t* frame) {
free(frame); free(frame);
} }
struct linkinterface* link_open(const char* if_name) { linkinterface_t* link_open(const char* if_name) {
struct linkinterface* link = (struct linkinterface*)malloc(sizeof(struct linkinterface)); linkinterface_t* link = (linkinterface_t*)malloc(sizeof(linkinterface_t));
link->if_name = strdup(if_name); link->if_name = strdup(if_name);
link->if_len = strlen(link->if_name); link->if_len = strlen(link->if_name);
@ -118,13 +118,13 @@ _bad0:
return NULL; return NULL;
} }
void link_free(struct linkinterface* link) { void link_free(linkinterface_t* link) {
close(link->fd); close(link->fd);
free(link->if_name); free(link->if_name);
free(link); free(link);
} }
ssize_t link_send(struct linkinterface* link, const uint8_t* dstAddr, ssize_t link_send(linkinterface_t* link, const uint8_t* dstAddr,
uint16_t type, frame_t* frame) uint16_t type, frame_t* frame)
{ {
// ETHER FRAME MUST NOT BE LESS THAN 64 (60) // ETHER FRAME MUST NOT BE LESS THAN 64 (60)
@ -151,7 +151,7 @@ ssize_t link_send(struct linkinterface* link, const uint8_t* dstAddr,
return sent; return sent;
} }
size_t link_recv(struct linkinterface* link, const uint8_t* srcAddr, size_t link_recv(linkinterface_t* link, const uint8_t* srcAddr,
uint16_t type, frame_t* frame) uint16_t type, frame_t* frame)
{ {
uint16_t want_type = htons(type); uint16_t want_type = htons(type);
@ -193,7 +193,7 @@ uint16_t checksum(const uint8_t* data, size_t len) {
return ~((uint16_t)sum); return ~((uint16_t)sum);
} }
ssize_t ip_send(struct linkinterface* link, const uint8_t* dstAddr, ssize_t ip_send(linkinterface_t* link, const uint8_t* dstAddr,
const uint8_t* dstIp, uint8_t proto, frame_t* frame) const uint8_t* dstIp, uint8_t proto, frame_t* frame)
{ {
// shift data to add space for IP header // shift data to add space for IP header
@ -222,7 +222,7 @@ ssize_t ip_send(struct linkinterface* link, const uint8_t* dstAddr,
int main(int argc, char** argv) { int main(int argc, char** argv) {
// ifname targetMAC // ifname targetMAC
struct linkinterface* link = link_open(argv[1]); linkinterface_t* link = link_open(argv[1]);
if (!link) { if (!link) {
perror("link_open"); perror("link_open");
return 1; return 1;