Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
P
PPSi
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
50
Issues
50
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
PPSi
Commits
cec0e7ec
Commit
cec0e7ec
authored
Jan 30, 2013
by
Danilo Sabato
Committed by
Alessandro Rubini
Feb 10, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
arch-bare-x86-64: fix pkt PTP msg format + last_rcv_time=timestamp
parent
657af51f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
3 deletions
+26
-3
bare-socket.c
arch-bare-x86-64/bare-socket.c
+23
-2
main-loop.c
arch-bare-x86-64/main-loop.c
+3
-1
No files found.
arch-bare-x86-64/bare-socket.c
View file @
cec0e7ec
...
...
@@ -14,13 +14,34 @@ Octet buffer_out[PP_PACKET_SIZE + 14];
int
bare_recv_packet
(
struct
pp_instance
*
ppi
,
void
*
pkt
,
int
len
,
TimeInternal
*
t
)
{
return
sys_recv
(
NP
(
ppi
)
->
ch
[
PP_NP_GEN
].
fd
,
pkt
,
len
,
0
);
if
(
t
)
pp_get_tstamp
(
t
);
return
sys_recv
(
NP
(
ppi
)
->
ch
[
PP_NP_GEN
].
fd
,
pkt
-
NP
(
ppi
)
->
proto_ofst
,
len
,
0
);
}
int
bare_send_packet
(
struct
pp_instance
*
ppi
,
void
*
pkt
,
int
len
,
TimeInternal
*
t
,
int
chtype
,
int
use_pdelay_addr
)
{
return
sys_send
(
NP
(
ppi
)
->
ch
[
chtype
].
fd
,
pkt
,
len
,
0
);
struct
bare_ethhdr
*
hdr
;
hdr
=
PROTO_HDR
(
pkt
);
hdr
->
h_proto
=
htons
(
ETH_P_1588
);
if
(
OPTS
(
ppi
)
->
gptp_mode
)
{
memcpy
(
hdr
->
h_dest
,
PP_PEER_MACADDRESS
,
6
);
}
else
{
memcpy
(
hdr
->
h_dest
,
PP_MCAST_MACADDRESS
,
6
);
}
/* raw socket implementation always uses gen socket */
memcpy
(
hdr
->
h_source
,
NP
(
ppi
)
->
ch
[
PP_NP_GEN
].
addr
,
6
);
if
(
t
)
pp_get_tstamp
(
t
);
return
sys_send
(
NP
(
ppi
)
->
ch
[
chtype
].
fd
,
hdr
,
len
+
NP
(
ppi
)
->
proto_ofst
,
0
);
}
int
pp_recv_packet
(
struct
pp_instance
*
ppi
,
void
*
pkt
,
int
len
,
TimeInternal
*
t
)
...
...
arch-bare-x86-64/main-loop.c
View file @
cec0e7ec
...
...
@@ -22,6 +22,7 @@ void bare_main_loop(struct pp_instance *ppi)
int
delay_ms
;
set_TimeInternal
(
&
ppi
->
last_rcv_time
,
0
,
0
);
NP
(
ppi
)
->
proto_ofst
=
14
;
/*
* The main loop here is based on select. While we are not
...
...
@@ -34,6 +35,7 @@ void bare_main_loop(struct pp_instance *ppi)
int
i
,
maxfd
;
struct
bare_timeval
tv
;
unsigned
char
packet
[
1500
];
void
*
payload
=
packet
+
16
;
/* aligned */
/* Wait for a packet or for the timeout */
tv
.
tv_sec
=
delay_ms
/
1000
;
...
...
@@ -64,7 +66,7 @@ void bare_main_loop(struct pp_instance *ppi)
*
* FIXME: we don't know which socket to receive from
*/
i
=
bare_recv_packet
(
ppi
,
pa
cket
,
sizeof
(
packet
)
,
i
=
bare_recv_packet
(
ppi
,
pa
yload
,
sizeof
(
packet
)
-
16
,
&
ppi
->
last_rcv_time
);
ppi
->
last_rcv_time
.
seconds
+=
DSPRO
(
ppi
)
->
currentUtcOffset
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment