Skip to content

P
PPSi
Commit c0398417 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

arch-gnu-linux: support raw sockets

parent 6d48414d
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 4 deletions
arch-gnu-linux/main-loop.c
View file @ c0398417
...@@ -35,6 +35,7 @@ void posix_main_loop(struct pp_instance *ppi) ...@@ -35,6 +35,7 @@ void posix_main_loop(struct pp_instance *ppi)
while (1) { while (1) {
int i; int i;
unsigned char packet[1500]; unsigned char packet[1500];
void *payload = packet + 16; /* aligned */
again: again:
...@@ -52,7 +53,7 @@ void posix_main_loop(struct pp_instance *ppi) ...@@ -52,7 +53,7 @@ void posix_main_loop(struct pp_instance *ppi)
* We got a packet. If it's not ours, continue consuming * We got a packet. If it's not ours, continue consuming
* the pending timeout * the pending timeout
*/ */
i = posix_recv_packet(ppi, packet, sizeof(packet), i = posix_recv_packet(ppi, payload, sizeof(packet) - 16,
&ppi->last_rcv_time); &ppi->last_rcv_time);
ppi->last_rcv_time.seconds += DSPRO(ppi)->currentUtcOffset; ppi->last_rcv_time.seconds += DSPRO(ppi)->currentUtcOffset;
......
arch-gnu-linux/posix-socket.c
View file @ c0398417
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <netpacket/packet.h> #include <netpacket/packet.h>
#include <net/if.h> #include <net/if.h>
#include <net/ethernet.h>
#include <arpa/inet.h> #include <arpa/inet.h>
...@@ -106,9 +107,17 @@ int posix_recv_packet(struct pp_instance *ppi, void *pkt, int len, ...@@ -106,9 +107,17 @@ int posix_recv_packet(struct pp_instance *ppi, void *pkt, int len,
TimeInternal *t) TimeInternal *t)
{ {
struct pp_channel *ch1 = NULL, *ch2 = NULL; struct pp_channel *ch1 = NULL, *ch2 = NULL;
void *hdr;
int ret;
if (OPTS(ppi)->ethernet_mode) if (OPTS(ppi)->ethernet_mode)
return posix_recv_msg(NP(ppi)->ch[PP_NP_GEN].fd, pkt, len, t); if (OPTS(ppi)->ethernet_mode) {
hdr = PROTO_HDR(pkt);
ret = posix_recv_msg(NP(ppi)->ch[PP_NP_GEN].fd, hdr,
len + NP(ppi)->proto_ofst, t);
return ret <= 0 ? ret : ret - NP(ppi)->proto_ofst;
/* FIXME: check header */
}
/* else: UDP */ /* else: UDP */
if (POSIX_ARCH(ppi)->rcv_switch) { if (POSIX_ARCH(ppi)->rcv_switch) {
...@@ -135,12 +144,15 @@ int posix_send_packet(struct pp_instance *ppi, void *pkt, int len, int chtype, ...@@ -135,12 +144,15 @@ int posix_send_packet(struct pp_instance *ppi, void *pkt, int len, int chtype,
int use_pdelay_addr) int use_pdelay_addr)
{ {
struct sockaddr_in addr; struct sockaddr_in addr;
void *hdr; struct ethhdr *hdr;
if (OPTS(ppi)->ethernet_mode) { if (OPTS(ppi)->ethernet_mode) {
hdr = PROTO_HDR(pkt); hdr = PROTO_HDR(pkt);
/* TODO: fill header */
hdr->h_proto = htons(ETH_P_1588);
memcpy(hdr->h_dest, "\x01\x1B\x19\x00\x00\x00", 6);
/* raw sockets implementation always use gen socket */ /* raw sockets implementation always use gen socket */
memcpy(hdr->h_source, NP(ppi)->ch[PP_NP_GEN].addr, 6);
return send(NP(ppi)->ch[PP_NP_GEN].fd, hdr, return send(NP(ppi)->ch[PP_NP_GEN].fd, hdr,
len + NP(ppi)->proto_ofst, 0); len + NP(ppi)->proto_ofst, 0);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment