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

isotp[send|recv]: support PDU sizes greater than 4095 

Allow PDU sizes greater than 4095 to be able to check the correct
implementation of the kernel socket API error handlings.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
pull/1/head
Oliver Hartkopp 2014-10-24 20:41:11 +02:00
parent 0c61f2ac4c
commit 2fa9b0005b
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
isotprecv.c
View File

@ -56,6 +56,7 @@
#include <linux/can/isotp.h> #include <linux/can/isotp.h>
#define NO_CAN_ID 0xFFFFFFFFU #define NO_CAN_ID 0xFFFFFFFFU
#define BUFSIZE 5000 /* size > 4095 to check socket API internal checks */
void print_usage(char *prg) void print_usage(char *prg)
{ {
@ -87,7 +88,7 @@ int main(int argc, char **argv)
__u32 force_rx_stmin = 0; __u32 force_rx_stmin = 0;
int loop = 0; int loop = 0;
unsigned char msg[4096]; unsigned char msg[BUFSIZE];
int nbytes; int nbytes;
addr.can_addr.tp.tx_id = addr.can_addr.tp.rx_id = NO_CAN_ID; addr.can_addr.tp.tx_id = addr.can_addr.tp.rx_id = NO_CAN_ID;
@ -194,8 +195,8 @@ int main(int argc, char **argv)
} }
do { do {
nbytes = read(s, msg, 4096); nbytes = read(s, msg, BUFSIZE);
if (nbytes > 0 && nbytes < 4096) if (nbytes > 0 && nbytes < BUFSIZE)
for (i=0; i < nbytes; i++) for (i=0; i < nbytes; i++)
printf("%02X ", msg[i]); printf("%02X ", msg[i]);
printf("\n"); printf("\n");

15
isotpsend.c
View File

@ -56,6 +56,7 @@
#include <linux/can/isotp.h> #include <linux/can/isotp.h>
#define NO_CAN_ID 0xFFFFFFFFU #define NO_CAN_ID 0xFFFFFFFFU
#define BUFSIZE 5000 /* size > 4095 to check socket API internal checks */
void print_usage(char *prg) void print_usage(char *prg)
{ {
@ -81,8 +82,9 @@ int main(int argc, char **argv)
int opt; int opt;
extern int optind, opterr, optopt; extern int optind, opterr, optopt;
__u32 force_tx_stmin = 0; __u32 force_tx_stmin = 0;
unsigned char buf[4096]; unsigned char buf[BUFSIZE];
int buflen = 0; int buflen = 0;
int retval = 0;
addr.can_addr.tp.tx_id = addr.can_addr.tp.rx_id = NO_CAN_ID; addr.can_addr.tp.tx_id = addr.can_addr.tp.rx_id = NO_CAN_ID;
@ -174,10 +176,17 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
while (buflen < 4096 && scanf("%hhx", &buf[buflen]) == 1) while (buflen < BUFSIZE && scanf("%hhx", &buf[buflen]) == 1)
buflen++; buflen++;
write(s, buf, buflen); retval = write(s, buf, buflen);
if (retval < 0) {
perror("write");
return retval;
}
if (retval != buflen)
fprintf(stderr, "wrote only %d from %d byte\n", retval, buflen);
/* /*
* due to a Kernel internal wait queue the PDU is sent completely * due to a Kernel internal wait queue the PDU is sent completely