Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 289b1ef9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I57cb2003,I569d2b81,I01a10e36 am: 6153b71a am: fb2ff0d5 am:...

Merge changes I57cb2003,I569d2b81,I01a10e36 am: 6153b71a am: fb2ff0d5 am: 1c9e1b28 am: bc315a3b

Change-Id: Id27aa115f507c5af7e234e7675f461b3ff1fc0e8
parents 5f79a0c0 bc315a3b
Loading
Loading
Loading
Loading
+13 −16
Original line number Diff line number Diff line
@@ -37,25 +37,22 @@

#include "dhcpmsg.h"

int fatal();

int open_raw_socket(const char *ifname __attribute__((unused)), uint8_t *hwaddr, int if_index)
{
    int s;
    struct sockaddr_ll bindaddr;

    if((s = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) {
        return fatal("socket(PF_PACKET)");
    }

    memset(&bindaddr, 0, sizeof(bindaddr));
    bindaddr.sll_family = AF_PACKET;
    bindaddr.sll_protocol = htons(ETH_P_IP);
    bindaddr.sll_halen = ETH_ALEN;
int fatal(const char*);

int open_raw_socket(const char* ifname __unused, uint8_t hwaddr[ETH_ALEN], int if_index) {
    int s = socket(PF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
    if (s < 0) return fatal("socket(PF_PACKET)");

    struct sockaddr_ll bindaddr = {
            .sll_family = AF_PACKET,
            .sll_protocol = htons(ETH_P_IP),
            .sll_ifindex = if_index,
            .sll_halen = ETH_ALEN,
    };
    memcpy(bindaddr.sll_addr, hwaddr, ETH_ALEN);
    bindaddr.sll_ifindex = if_index;

    if (bind(s, (struct sockaddr *)&bindaddr, sizeof(bindaddr)) < 0) {
        close(s);
        return fatal("Cannot bind raw socket to interface");
    }

+3 −1
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@
#ifndef _WIFI_PACKET_H_
#define _WIFI_PACKET_H_

int open_raw_socket(const char *ifname, uint8_t *hwaddr, int if_index);
#include <linux/if_ether.h>

int open_raw_socket(const char* ifname, uint8_t hwaddr[ETH_ALEN], int if_index);
int send_packet(int s, int if_index, struct dhcp_msg *msg, int size,
                uint32_t saddr, uint32_t daddr, uint32_t sport, uint32_t dport);
int receive_packet(int s, struct dhcp_msg *msg);