sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

j1939: use defines instead of magic values 

for now cover most of PGN values.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
pull/134/head
Oleksij Rempel 2019-03-14 11:50:44 +01:00 committed by Marc Kleine-Budde
parent 06d3beb08c
commit 314f8a92ae
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jacd.c
View File

@ -175,14 +175,14 @@ static int parse_range(char *str)
/* j1939 socket */ /* j1939 socket */
static const struct j1939_filter filt[] = { static const struct j1939_filter filt[] = {
{ {
.pgn = 0x0ee00, .pgn = J1939_PGN_ADDRESS_CLAIMED,
.pgn_mask = 0x3ff00, .pgn_mask = J1939_PGN_PDU1_MAX,
}, { }, {
.pgn = 0x0ea00, .pgn = J1939_PGN_REQUEST,
.pgn_mask = 0x3ff00, .pgn_mask = J1939_PGN_PDU1_MAX,
}, { }, {
.pgn = 0x0fed8, .pgn = 0x0fed8,
.pgn_mask = 0x3ffff, .pgn_mask = J1939_PGN_MAX,
}, },
}; };
@ -195,7 +195,7 @@ static int open_socket(const char *device, uint64_t name)
.can_addr.j1939 = { .can_addr.j1939 = {
.name = name, .name = name,
.addr = J1939_IDLE_ADDR, .addr = J1939_IDLE_ADDR,
.pgn = 0x0ee00, .pgn = J1939_NO_PGN,
}, },
.can_ifindex = if_nametoindex(s.intf), .can_ifindex = if_nametoindex(s.intf),
}; };
@ -260,7 +260,7 @@ static int claim_address(int sock, uint64_t name, int sa)
.can_addr.j1939 = { .can_addr.j1939 = {
.name = name, .name = name,
.addr = sa, .addr = sa,
.pgn = 0x0ee00, .pgn = J1939_NO_PGN,
}, },
.can_ifindex = if_nametoindex(s.intf), .can_ifindex = if_nametoindex(s.intf),
}; };
@ -280,7 +280,7 @@ static int request_addresses(int sock)
int ret; int ret;
static const struct sockaddr_can saddr = { static const struct sockaddr_can saddr = {
.can_family = AF_CAN, .can_family = AF_CAN,
.can_addr.j1939.pgn = 0x0ea00, .can_addr.j1939.pgn = J1939_PGN_REQUEST,
.can_addr.j1939.addr = J1939_NO_ADDR, .can_addr.j1939.addr = J1939_NO_ADDR,
}; };
@ -569,11 +569,11 @@ int main(int argc, char *argv[])
error(1, errno, "recvfrom()"); error(1, errno, "recvfrom()");
} }
switch (saddr.can_addr.j1939.pgn) { switch (saddr.can_addr.j1939.pgn) {
case 0x0ea00: case J1939_PGN_REQUEST:
if (ret < 3) if (ret < 3)
break; break;
pgn = dat[0] + (dat[1] << 8) + ((dat[2] & 0x03) << 16); pgn = dat[0] + (dat[1] << 8) + ((dat[2] & 0x03) << 16);
if (pgn != 0x0ee00) if (pgn != J1939_PGN_ADDRESS_CLAIMED)
/* not interested */ /* not interested */
break; break;
if (s.state == STATE_REQ_SENT) { if (s.state == STATE_REQ_SENT) {
@ -587,7 +587,7 @@ int main(int argc, char *argv[])
schedule_itimer(50); schedule_itimer(50);
} }
break; break;
case 0x0ee00: case J1939_PGN_ADDRESS_CLAIMED:
if (saddr.can_addr.j1939.addr >= J1939_IDLE_ADDR) { if (saddr.can_addr.j1939.addr >= J1939_IDLE_ADDR) {
sa = lookup_name(saddr.can_addr.j1939.name); sa = lookup_name(saddr.can_addr.j1939.name);
if (sa < J1939_IDLE_ADDR) if (sa < J1939_IDLE_ADDR)

2
jspy.c
View File

@ -162,7 +162,7 @@ int main(int argc, char **argv)
filt.addr_mask = ~0; filt.addr_mask = ~0;
++filter; ++filter;
} }
if (s.addr.can_addr.j1939.pgn <= 0x3ffff) { if (s.addr.can_addr.j1939.pgn <= J1939_PGN_MAX) {
filt.pgn = s.addr.can_addr.j1939.pgn; filt.pgn = s.addr.can_addr.j1939.pgn;
filt.pgn_mask = ~0; filt.pgn_mask = ~0;
++filter; ++filter;

4
libj1939.c
View File

@ -183,13 +183,13 @@ const char *libj1939_addr2str(const struct sockaddr_can *can)
} }
if (can->can_addr.j1939.name) { if (can->can_addr.j1939.name) {
str += sprintf(str, "%016llx", (unsigned long long)can->can_addr.j1939.name); str += sprintf(str, "%016llx", (unsigned long long)can->can_addr.j1939.name);
if (can->can_addr.j1939.pgn == 0x0ee00) if (can->can_addr.j1939.pgn == J1939_PGN_ADDRESS_CLAIMED)
str += sprintf(str, ".%02x", can->can_addr.j1939.addr); str += sprintf(str, ".%02x", can->can_addr.j1939.addr);
} else if (can->can_addr.j1939.addr <= 0xfe) } else if (can->can_addr.j1939.addr <= 0xfe)
str += sprintf(str, "%02x", can->can_addr.j1939.addr); str += sprintf(str, "%02x", can->can_addr.j1939.addr);
else else
str += sprintf(str, "-"); str += sprintf(str, "-");
if (can->can_addr.j1939.pgn <= 0x3ffff) if (can->can_addr.j1939.pgn <= J1939_PGN_MAX)
str += sprintf(str, ",%05x", can->can_addr.j1939.pgn); str += sprintf(str, ",%05x", can->can_addr.j1939.pgn);
return buf; return buf;