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

testj1939: use address to string function from libj1939 

canaddr2str() from testj1939 and libj1939's libj1939_addr2str provide
the same functionality. Remove the local helper function and use
libj1939_addr2str instead.

Signed-off-by: Bastian Stender <bst@pengutronix.de>
pull/66/head
Bastian Stender 2018-01-22 11:44:40 +01:00
parent 0bc94df9ca
commit 1f3f2f6163
3 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
GNUmakefile.am
View File

@ -69,6 +69,7 @@ bin_PROGRAMS = \
jacd_LDADD = libj1939.la jacd_LDADD = libj1939.la
jspy_LDADD = libj1939.la jspy_LDADD = libj1939.la
jsr_LDADD = libj1939.la jsr_LDADD = libj1939.la
testj1939_LDADD = libj1939.la
EXTRA_DIST = \ EXTRA_DIST = \
.travis.yml \ .travis.yml \

2
Makefile
View File

@ -88,6 +88,7 @@ log2asc.o: lib.h
asc2log.o: lib.h asc2log.o: lib.h
jspy.o: libj1939.h jspy.o: libj1939.h
jsr.o: libj1939.h jsr.o: libj1939.h
testj1939.o: libj1939.h
canframelen.o: canframelen.h canframelen.o: canframelen.h
cansend: cansend.o lib.o cansend: cansend.o lib.o
@ -102,3 +103,4 @@ canbusload: canbusload.o canframelen.o
jspy: jspy.o libj1939.o jspy: jspy.o libj1939.o
jsr: jsr.o libj1939.o jsr: jsr.o libj1939.o
testj1939: testj1939.o libj1939.o

34
testj1939.c
View File

@ -23,8 +23,8 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <net/if.h> #include <net/if.h>
#include <linux/can.h>
#include <linux/can/j1939.h> #include "libj1939.h"
static const char help_msg[] = static const char help_msg[] =
"testj1939: demonstrate j1939 use\n" "testj1939: demonstrate j1939 use\n"
@ -69,28 +69,6 @@ static void parse_canaddr(char *spec, struct sockaddr_can *paddr)
paddr->can_addr.j1939.name = strtoul(str, NULL, 0); paddr->can_addr.j1939.name = strtoul(str, NULL, 0);
} }
static const char *canaddr2str(const struct sockaddr_can *paddr)
{
static char buf[128];
char *str = buf;
char ifname[IF_NAMESIZE];
if (paddr->can_ifindex)
str += sprintf(str, "%s", if_indextoname(paddr->can_ifindex, ifname));
*str++ = ':';
if (paddr->can_addr.j1939.addr != J1939_NO_ADDR)
str += sprintf(str, "%02x", paddr->can_addr.j1939.addr);
*str++ = ',';
if (paddr->can_addr.j1939.pgn != J1939_NO_PGN)
str += sprintf(str, "%05x", paddr->can_addr.j1939.pgn);
*str++ = ',';
if (paddr->can_addr.j1939.name != J1939_NO_NAME)
str += sprintf(str, "%016llx", paddr->can_addr.j1939.name);
*str++ = 0;
return buf;
}
static void onsigalrm(int sig) static void onsigalrm(int sig)
{ {
error(0, 0, "exit as requested"); error(0, 0, "exit as requested");
@ -199,7 +177,7 @@ int main(int argc, char *argv[])
} }
if (verbose) if (verbose)
fprintf(stderr, "- bind(, %s, %zi);\n", canaddr2str(&sockname), sizeof(sockname)); fprintf(stderr, "- bind(, %s, %zi);\n", libj1939_addr2str(&sockname), sizeof(sockname));
ret = bind(sock, (void *)&sockname, sizeof(sockname)); ret = bind(sock, (void *)&sockname, sizeof(sockname));
if (ret < 0) if (ret < 0)
error(1, errno, "bind()"); error(1, errno, "bind()");
@ -208,7 +186,7 @@ int main(int argc, char *argv[])
if (!valid_peername) if (!valid_peername)
error(1, 0, "no peername supplied"); error(1, 0, "no peername supplied");
if (verbose) if (verbose)
fprintf(stderr, "- connect(, %s, %zi);\n", canaddr2str(&peername), sizeof(peername)); fprintf(stderr, "- connect(, %s, %zi);\n", libj1939_addr2str(&peername), sizeof(peername));
ret = connect(sock, (void *)&peername, sizeof(peername)); ret = connect(sock, (void *)&peername, sizeof(peername));
if (ret < 0) if (ret < 0)
error(1, errno, "connect()"); error(1, errno, "connect()");
@ -226,7 +204,7 @@ int main(int argc, char *argv[])
*/ */
if (valid_peername && !todo_connect) { if (valid_peername && !todo_connect) {
if (verbose) if (verbose)
fprintf(stderr, "- sendto(, <dat>, %i, 0, %s, %zi);\n", todo_send, canaddr2str(&peername), sizeof(peername)); fprintf(stderr, "- sendto(, <dat>, %i, 0, %s, %zi);\n", todo_send, libj1939_addr2str(&peername), sizeof(peername));
ret = sendto(sock, dat, todo_send, 0, ret = sendto(sock, dat, todo_send, 0,
(void *)&peername, sizeof(peername)); (void *)&peername, sizeof(peername));
} else { } else {
@ -267,7 +245,7 @@ int main(int argc, char *argv[])
if (todo_echo) { if (todo_echo) {
if (verbose) if (verbose)
fprintf(stderr, "- sendto(, <dat>, %i, 0, %s, %i);\n", ret, canaddr2str(&peername), peernamelen); fprintf(stderr, "- sendto(, <dat>, %i, 0, %s, %i);\n", ret, libj1939_addr2str(&peername), peernamelen);
ret = sendto(sock, dat, ret, 0, ret = sendto(sock, dat, ret, 0,
(void *)&peername, peernamelen); (void *)&peername, peernamelen);
if (ret < 0) if (ret < 0)