chao
/
linuxptp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

raw: Implement the peer transmission option. 

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
master
Richard Cochran 2012-04-05 17:20:54 +02:00
parent a0efbfd138
commit 3983406818
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
raw.c
View File

@ -45,7 +45,8 @@
struct raw { struct raw {
struct transport t; struct transport t;
struct eth_addr addr; struct eth_addr ptp_addr;
struct eth_addr p2p_addr;
}; };
#define OP_AND (BPF_ALU | BPF_AND | BPF_K) #define OP_AND (BPF_ALU | BPF_AND | BPF_K)
@ -70,9 +71,9 @@ static struct sock_filter raw_filter[N_RAW_FILTER] = {
}; };
static int raw_configure(int fd, int event, int index, static int raw_configure(int fd, int event, int index,
unsigned char *addr, int enable) unsigned char *addr1, unsigned char *addr2, int enable)
{ {
int filter_test, option; int err1, err2, filter_test, option;
struct packet_mreq mreq; struct packet_mreq mreq;
struct sock_fprog prg = { N_RAW_FILTER, raw_filter }; struct sock_fprog prg = { N_RAW_FILTER, raw_filter };
@ -95,12 +96,21 @@ static int raw_configure(int fd, int event, int index,
mreq.mr_ifindex = index; mreq.mr_ifindex = index;
mreq.mr_type = PACKET_MR_MULTICAST; mreq.mr_type = PACKET_MR_MULTICAST;
mreq.mr_alen = 6; mreq.mr_alen = 6;
memcpy(mreq.mr_address, addr, 6); memcpy(mreq.mr_address, addr1, 6);
if (!setsockopt(fd, SOL_PACKET, option, &mreq, sizeof(mreq))) {
return 0; err1 = setsockopt(fd, SOL_PACKET, option, &mreq, sizeof(mreq));
} if (err1)
pr_warning("setsockopt PACKET_MR_MULTICAST failed: %m"); pr_warning("setsockopt PACKET_MR_MULTICAST failed: %m");
memcpy(mreq.mr_address, addr2, 6);
err2 = setsockopt(fd, SOL_PACKET, option, &mreq, sizeof(mreq));
if (err2)
pr_warning("setsockopt PACKET_MR_MULTICAST failed: %m");
if (!err1 && !err2)
return 0;
mreq.mr_ifindex = index; mreq.mr_ifindex = index;
mreq.mr_type = PACKET_MR_ALLMULTI; mreq.mr_type = PACKET_MR_ALLMULTI;
mreq.mr_alen = 0; mreq.mr_alen = 0;
@ -129,6 +139,7 @@ static int raw_close(struct transport *t, struct fdarray *fda)
} }
static unsigned char ptp_dst_mac[MAC_LEN] = { PTP_DST_MAC }; static unsigned char ptp_dst_mac[MAC_LEN] = { PTP_DST_MAC };
static unsigned char p2p_dst_mac[MAC_LEN] = { P2P_DST_MAC };
static int open_socket(char *name, int event) static int open_socket(char *name, int event)
{ {
@ -156,7 +167,7 @@ static int open_socket(char *name, int event)
pr_err("setsockopt SO_BINDTODEVICE failed: %m"); pr_err("setsockopt SO_BINDTODEVICE failed: %m");
goto no_option; goto no_option;
} }
if (raw_configure(fd, event, index, ptp_dst_mac, 1)) if (raw_configure(fd, event, index, ptp_dst_mac, p2p_dst_mac, 1))
goto no_option; goto no_option;
return fd; return fd;
@ -172,11 +183,14 @@ static int raw_open(struct transport *t, char *name,
struct raw *raw = container_of(t, struct raw, t); struct raw *raw = container_of(t, struct raw, t);
int efd, gfd; int efd, gfd;
memcpy(raw->addr.dst, ptp_dst_mac, MAC_LEN); memcpy(raw->ptp_addr.dst, ptp_dst_mac, MAC_LEN);
memcpy(raw->p2p_addr.dst, p2p_dst_mac, MAC_LEN);
if (sk_interface_macaddr(name, raw->addr.src, MAC_LEN)) if (sk_interface_macaddr(name, raw->ptp_addr.src, MAC_LEN))
goto no_mac; goto no_mac;
memcpy(raw->p2p_addr.src, raw->ptp_addr.src, MAC_LEN);
efd = open_socket(name, 1); efd = open_socket(name, 1);
if (efd < 0) if (efd < 0)
goto no_event; goto no_event;
@ -223,7 +237,11 @@ static int raw_send(struct transport *t, struct fdarray *fda, int event, int pee
len += sizeof(*hdr); len += sizeof(*hdr);
hdr = (struct eth_hdr *) ptr; hdr = (struct eth_hdr *) ptr;
memcpy(&hdr->mac, &raw->addr, sizeof(hdr->mac)); if (peer)
memcpy(&hdr->mac, &raw->p2p_addr, sizeof(hdr->mac));
else
memcpy(&hdr->mac, &raw->ptp_addr, sizeof(hdr->mac));
hdr->type = htons(ETH_P_1588); hdr->type = htons(ETH_P_1588);
cnt = send(fd, ptr, len, 0); cnt = send(fd, ptr, len, 0);