unsigned int cegw_errno = 0;
-enum {
- CEGW_ERR_UNKNOWN,
- CEGW_ERR_COLON,
- CEGW_ERR_GETADDRI,
- CEGW_ERR_FLTALCK,
- CEGW_ERR_FLTPARSE,
- CEGW_ERR_LAST
-};
-
-char *cegw_errlist[] = {
- [CEGW_ERR_COLON ] = "expected ':' (<hostname>:<port>)",
- [CEGW_ERR_GETADDRI] = "getaddrinfo failed",
- [CEGW_ERR_FLTALCK ] = "filter alloc failed",
- [CEGW_ERR_FLTPARSE] = "filter parsing failed"
-};
-
static const char help_msg[] = "usage:\n"
" %s <can_if>[,filter]* <udp_listen_addr>:<port> <udp_dest_addr>:<port>\n"
" [list of additional udp recipients <addr>:<port>]\n"
" therefore cloned. Notice that there can be more udp recipients.\n"
" The can filter is specified in the same way as in candump utility.\n";
-const struct addrinfo hints = {
- .ai_family = AF_INET,
+struct addrinfo hints = {
.ai_socktype = SOCK_DGRAM
};
-static void perr(char *s)
-{
- if (s) {
- if (cegw_errno == 0 || cegw_errno >= CEGW_ERR_LAST) {
- fprintf(stderr, "error: %s\n", s);
-
- } else {
- fprintf(stderr, "error: %s, %s\n", s, cegw_errlist[cegw_errno]);
- }
- return;
- }
-
- fprintf(stderr, "error: %s\n", cegw_errlist[cegw_errno]);
-}
-
/**
* readsockaddr - parses @in for eth address.
* Valid input is e.g. 127.0.0.1:10502. If parsing fails
* @param[out] addr filled sockaddr_in structure
* @return 0 on success, -1 otherwise
*/
-int readsockaddr(char *arg, struct sockaddr_in *addr)
+int readsockaddr(char *arg, struct sockaddr *addr, int ai_family)
{
int ret;
char *delim;
delim = strchr(arg, ':');
if (delim == NULL) {
- cegw_errno = CEGW_ERR_COLON;
- return -1;
+ fprintf(stderr, "expected ':' (<hostname>:<port>)");
+ exit(1);
}
*delim = '\0';
delim++;
+ hints.ai_family = ai_family;
+
ret = getaddrinfo(arg, delim, &hints, &res);
if (ret != 0) {
- fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(ret));
- cegw_errno = CEGW_ERR_GETADDRI;
- return -1;
+ fprintf(stderr, "getaddrinfo failed: %s\n", gai_strerror(ret));
+ exit(1);
}
- memcpy(addr, res->ai_addr, sizeof(*addr));
+ memcpy(addr, res->ai_addr, res->ai_addrlen);
freeaddrinfo(res);
return 0;
rfilter = malloc(numfilter * sizeof(*rfilter));
if (!rfilter) {
- cegw_errno = CEGW_ERR_FLTALCK;
- return -1;
+ fprintf(stderr, "filter malloc failed");
+ exit(1);
}
numfilter = 0;
rfilter[numfilter].can_mask &= ~CAN_ERR_FLAG;
numfilter++;
} else if (sscanf(ptr, "#%x", err_mask) != 1) {
- cegw_errno = CEGW_ERR_FLTPARSE;
- free(rfilter);
- return -1;
+ fprintf(stderr, "filter parsing failed");
+ exit(1);
}
}
char *nptr;
int numfilter = 0;
int udp_sock, can_sock;
+ int addrlen;
can_err_mask_t err_mask = 0;
- struct sockaddr_in udp_addr;
struct sockaddr_can can_addr;
- struct sockaddr_in *dst = NULL;
+ struct sockaddr *dst = NULL;
struct cegw_ioctl *gwctl = NULL;
struct can_filter *filter = NULL;
+ /* udp_addr can store both - in and in6 addresses */
+ struct sockaddr_in6 udp6_addr;
+ struct sockaddr *udp_addr = (struct sockaddr *) &udp6_addr;
+
+
if (argc == 1 || (argc == 2 && strcmp(argv[1], "-h") == 0)) {
printf(help_msg, argv[0], argv[0]);
return 0;
}
if (argc < 4) {
- perr("not enough arguments");
+ fprintf(stderr, "not enough arguments\n");
printf(help_msg, argv[0], argv[0]);
return 1;
}
dstcnt = argc-3;
- gwctl = (struct cegw_ioctl*)malloc(sizeof(*gwctl) + (dstcnt)*sizeof(struct sockaddr_in));
for (i=1; i<argc; i++) {
switch (i) {
can_addr.can_family = AF_CAN;
tmpi = if_nametoindex(argv[i]);
if (tmpi == 0) {
- perr("given can interface not found");
- free(gwctl);
+ fprintf(stderr, "given can interface not found\n");
return 1;
}
+
can_addr.can_ifindex = tmpi;
break;
case 2: /* listen addr */
- if (readsockaddr(argv[i], &udp_addr) != 0) {
- perr("reading listening address failed");
- free(gwctl);
- return 1;
+ readsockaddr(argv[i], udp_addr, AF_UNSPEC);
+ switch (udp_addr->sa_family) {
+ case AF_INET:
+ addrlen = sizeof(struct sockaddr_in);
+ break;
+ case AF_INET6:
+ addrlen = sizeof(struct sockaddr_in6);
+ break;
+ default:
+ fprintf(stderr, "unexpected sockaddr family");
+ break;
}
+ gwctl = (struct cegw_ioctl*)malloc(sizeof(*gwctl) + dstcnt*addrlen);
break;
default: /* udp destination */
- dst = &gwctl->udp_dst[i-3];
- if (readsockaddr(argv[i], dst) != 0) {
- perr("reading udp destination failed");
- free(gwctl);
- return 1;
- }
+ dst = (struct sockaddr *)(gwctl->udp_dst + (i-3)*addrlen);
+ readsockaddr(argv[i], dst, udp_addr->sa_family);
+
break;
}
}
/* prepare udp socket */
- udp_sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+ udp_sock = socket(udp_addr->sa_family, SOCK_DGRAM, IPPROTO_UDP);
if (udp_sock == -1) {
- perror("udp socket()");
- free(gwctl);
+ perror("udp socket(..)");
return 1;
}
- if (bind(udp_sock, (struct sockaddr *)&udp_addr, sizeof(struct sockaddr_in)) != 0) {
+ if (bind(udp_sock, udp_addr, addrlen) != 0) {
perror("bind(udp)");
- free(gwctl);
return 1;
}
/* prepare can socket */
can_sock = socket(PF_CAN, SOCK_RAW, CAN_RAW);
if (can_sock == -1) {
- perror("can socket()");
- free(gwctl);
+ perror("can socket(..)");
return 1;
}
if (bind(can_sock, (struct sockaddr *)&can_addr, sizeof(struct sockaddr_can)) != 0) {
perror("bind(can)");
- free(gwctl);
return 1;
}
/* can filter */
- if (nptr && (readfilter(nptr, &filter, &numfilter, &err_mask) != 0)) {
- perr("can filter");
- free(gwctl);
- return 1;
- }
+ if (nptr)
+ readfilter(nptr, &filter, &numfilter, &err_mask);
if (err_mask)
setsockopt(can_sock, SOL_CAN_RAW, CAN_RAW_ERR_FILTER,
fd = open("/dev/canethgw", O_RDONLY);
if (fd == -1) {
perror("/dev/canethgw");
- free(gwctl);
return 1;
}
gwctl->can_sock = can_sock;
gwctl->udp_sock = udp_sock;
gwctl->udp_dstcnt = dstcnt;
- gwctl->udp_addrlen = sizeof(struct sockaddr_in);
+ gwctl->udp_addrlen = addrlen;
if (ioctl(fd, CEGW_IOCTL_START, gwctl) != 0) {
perror("ioctl");
- free(gwctl);
return 1;
}
printf("gateway successfully set and running\n");
projects / can-eth-gw.git / blobdiff