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

Merge pull request #231 from olerem/jcat-bam 

j1939cat: add broadcast support
pull/237/head
Marc Kleine-Budde 2020-08-07 14:23:46 +02:00 committed by GitHub
parent 659e0acfe6 327587b2c8
commit 58dc257e11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
j1939cat.c
View File

@ -55,6 +55,7 @@ struct j1939cat_priv {
bool todo_recv; bool todo_recv;
bool todo_filesize; bool todo_filesize;
bool todo_connect; bool todo_connect;
int todo_broadcast;
unsigned long polltimeout; unsigned long polltimeout;
@ -77,6 +78,7 @@ static const char help_msg[] =
" -P <timeout> poll timeout in milliseconds before sending data.\n" " -P <timeout> poll timeout in milliseconds before sending data.\n"
" With this option send() will be used with MSG_DONTWAIT flag.\n" " With this option send() will be used with MSG_DONTWAIT flag.\n"
" -R <count> Set send repeat count. Default: 1\n" " -R <count> Set send repeat count. Default: 1\n"
" -B Allow to send and receive broadcast packets.\n"
"\n" "\n"
"Example:\n" "Example:\n"
"j1939cat -i some_file_to_send can0:0x80 :0x90,0x12300\n" "j1939cat -i some_file_to_send can0:0x80 :0x90,0x12300\n"
@ -84,7 +86,7 @@ static const char help_msg[] =
"\n" "\n"
; ;
static const char optstring[] = "?hi:vs:rp:P:R:"; static const char optstring[] = "?hi:vs:rp:P:R:B";
static void j1939cat_init_sockaddr_can(struct sockaddr_can *sac) static void j1939cat_init_sockaddr_can(struct sockaddr_can *sac)
@ -560,6 +562,16 @@ static int j1939cat_sock_prepare(struct j1939cat_priv *priv)
(char *) &sock_opt, sizeof(sock_opt))) (char *) &sock_opt, sizeof(sock_opt)))
err(1, "setsockopt timestamping"); err(1, "setsockopt timestamping");
if (priv->todo_broadcast) {
ret = setsockopt(priv->sock, SOL_SOCKET, SO_BROADCAST,
&priv->todo_broadcast,
sizeof(priv->todo_broadcast));
if (ret < 0) {
warn("setsockopt: filed to set broadcast");
return EXIT_FAILURE;
}
}
ret = bind(priv->sock, (void *)&priv->sockname, sizeof(priv->sockname)); ret = bind(priv->sock, (void *)&priv->sockname, sizeof(priv->sockname));
if (ret < 0) { if (ret < 0) {
warn("bind()"); warn("bind()");
@ -619,6 +631,9 @@ static int j1939cat_parse_args(struct j1939cat_priv *priv, int argc, char *argv[
if (priv->repeat < 1) if (priv->repeat < 1)
err(EXIT_FAILURE, "send/repeat count can't be less then 1\n"); err(EXIT_FAILURE, "send/repeat count can't be less then 1\n");
break; break;
case 'B':
priv->todo_broadcast = 1;
break;
case 'h': /*fallthrough*/ case 'h': /*fallthrough*/
default: default:
fputs(help_msg, stderr); fputs(help_msg, stderr);