Merge 63500f8dd0 into 44e6eb45e3

bcmserver.c

@@ -153,7 +153,7 @@ int main(void)
 
 	char buf[MAXLEN];
 	char format[FORMATSZ];
-	char rxmsg[64];
+	char rxmsg[50];
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wpragmas"
@@ -234,7 +234,7 @@ int main(void)
 	}
 
 	while (1) {
-again:
+
 		FD_ZERO(&readfds);
 		FD_SET(sc, &readfds);
 		FD_SET(sa, &readfds);
@@ -242,8 +242,6 @@ again:
 		select((sc > sa)?sc+1:sa+1, &readfds, NULL, NULL, NULL);
 
 		if (FD_ISSET(sc, &readfds)) {
-			size_t size = sizeof(rxmsg);
-			int len = 0, res;
 
 			recvfrom(sc, &msg, sizeof(msg), 0,
 				 (struct sockaddr*)&caddr, &caddrlen);
@@ -251,35 +249,17 @@ again:
 			ifr.ifr_ifindex = caddr.can_ifindex;
 			ioctl(sc, SIOCGIFNAME, &ifr);
 
-			res = snprintf(rxmsg, size, "< %s %03X %d ", ifr.ifr_name,
+			sprintf(rxmsg, "< %s %03X %d ", ifr.ifr_name,
 				msg.msg_head.can_id, msg.frame.can_dlc);
-			if (res < 0 || (size_t)res >= size) {
-				printf("Error: rxmsg buffer (size %zu) too small for data.\n", size);
-				continue;
-			}
 
-			len += res;
+			for ( i = 0; i < msg.frame.can_dlc; i++)
-
+				sprintf(rxmsg + strlen(rxmsg), "%02X ",
-			for (i = 0; i < msg.frame.can_dlc; i++) {
+					msg.frame.data[i]);
-				res = snprintf(rxmsg + len, size - len, "%02X ", msg.frame.data[i]);
-				if (res < 0 || (size_t)res >= (size - len)) {
-					printf("Error: rxmsg buffer (size %zu) too small for data.\n", size);
-					goto again;
-				}
-
-				len += res;
-			}
 
 			/* delimiter '\0' for Adobe(TM) Flash(TM) XML sockets */
-			res = snprintf(rxmsg + len, size - len, ">");
+			strcat(rxmsg, ">\0");
-			if (res < 0 || (size_t)res >= (size - len)) {
-				printf("Error: rxmsg buffer (size %zu) too small for data.\n", size);
-				continue;
-			}
 
-			len += res;
+			send(sa, rxmsg, strlen(rxmsg) + 1, 0);
-
-			send(sa, rxmsg, len + 1, 0);
 		}
 
 

canlogserver.c

@@ -177,8 +177,7 @@ int main(int argc, char **argv)
 	sigset_t sigset;
 	fd_set rdfs;
 	int s[MAXDEV];
-	int socki;
+	int socki, accsocket;
-	int accsocket = -1;
 	canid_t mask[MAXDEV] = {0};
 	canid_t value[MAXDEV] = {0};
 	int inv_filter[MAXDEV] = {0};
@@ -287,7 +286,7 @@ int main(int argc, char **argv)
 	inaddr.sin_addr.s_addr = htonl(INADDR_ANY);
 	inaddr.sin_port = htons(port);
 
-	while(running && bind(socki, (struct sockaddr*)&inaddr, sizeof(inaddr)) < 0) {
+	while(bind(socki, (struct sockaddr*)&inaddr, sizeof(inaddr)) < 0) {
 		struct timespec f = {
 			.tv_nsec = 100 * 1000 * 1000,
 		};
@@ -296,28 +295,18 @@ int main(int argc, char **argv)
 		nanosleep(&f, NULL);
 	}
 
-	/*
-	 * Check if loop exited due to signal (during nanosleep) rather than
-	 * successful bind.
-	 */
-	if (!running) {
-		close(socki);
-		return 128 + signal_num;
-	}
-
 	if (listen(socki, 3) != 0) {
 		perror("listen");
 		exit(1);
 	}
 
-	while(running) {
+	while(1) {
 		accsocket = accept(socki, (struct sockaddr*)&clientaddr, &sin_size);
 		if (accsocket > 0) {
 			//printf("accepted\n");
 			if (!fork())
 				break;
 			close(accsocket);
-			accsocket = -1;
 		}
 		else if (errno != EINTR) {
 			perror("accept");
@@ -325,17 +314,6 @@ int main(int argc, char **argv)
 		}
 	}
 
-	/*
-	 * Check if loop exited due to signal (accept returned EINTR) rather
-	 * than successful fork
-	 */
-	if (!running) {
-		if (accsocket > 0)
-			close(accsocket);
-		close(socki);
-		return 128 + signal_num;
-	}
-
 	for (i=0; i<currmax; i++) {
 
 		pr_debug("open %d '%s' m%08X v%08X i%d e%d.\n",

canplayer-bisect

@@ -0,0 +1,205 @@
+#!/bin/bash
+
+if [ -z "${CANPLAYER}" ]; then
+	CANPLAYER="canplayer"
+fi
+
+die() {
+	echo "$*" > /dev/stderr
+	exit 1
+}
+
+usage() {
+	echo "canplayer-bisect <start|stop|clean|good|yes|bad|no|again|where|undo> <logfile> <canplayer options>"
+}
+
+is_ready() {
+	if [ ! -d .canplayer-bisect ]; then
+		usage
+		exit 1
+	fi
+
+	return 0
+}
+
+setup() {
+	is_ready
+
+	LOGFILE=$(cat .canplayer-bisect/logfile |head -n 1)
+
+	SAVED_LEN="$(cat .canplayer-bisect/len|tail -n 1)"
+	LEN="$(wc -l ${LOGFILE} | awk '{ print $1 }')"
+
+	if [ "$LEN" != "$SAVED_LEN" ]; then
+		die "logfile has changed size. restart"
+	fi
+
+	CANPLAYER_ARGS=$(cat .canplayer-bisect/args |head -n 1)
+
+	HEAD="$(cat .canplayer-bisect/head |tail -n 1)"
+	TAIL="$(cat .canplayer-bisect/tail |tail -n 1)"
+}
+
+back() {
+	HEAD="$(cat .canplayer-bisect/head |tail -n 2 |head -n1)"
+	TAIL="$(cat .canplayer-bisect/tail |tail -n 2 |head -n1)"
+}
+
+do_undo() {
+	sed -i '$ d' .canplayer-bisect/head
+	sed -i '$ d' .canplayer-bisect/tail
+}
+
+teardown() {
+	mkdir -p .canplayer-bisect
+	echo $LEN > .canplayer-bisect/len
+	echo $LOGFILE > .canplayer-bisect/logfile
+	echo $CANPLAYER_ARGS > .canplayer-bisect/args
+
+	echo $HEAD >> .canplayer-bisect/head
+	echo $TAIL >> .canplayer-bisect/tail
+}
+
+show() {
+	cat $LOGFILE | sed -n ${HEAD},${TAIL}p
+}
+
+play() {
+	#we *could* pipe directly to canplayer, but then the user can't add -l i to CANPLAYER_ARGS to hunt for packets using looped playback
+	the_show="$(mktemp)"
+	trap "rm -rf \"${the_show}\"" EXIT
+
+	show > "${the_show}"
+	"${CANPLAYER}" ${CANPLAYER_ARGS} -I "${the_show}"
+}
+
+do_show() {
+	setup
+
+	show
+}
+
+check_heads_n_tails() {
+	if [ $HEAD -eq $TAIL ]; then
+		do_stop
+	fi
+}
+
+do_good() {
+	setup
+
+	check_heads_n_tails
+
+	if [ $(( $HEAD + 1 )) -eq $TAIL ]; then
+		TAIL=$HEAD
+	else
+		TAIL=$(( ( $TAIL - $HEAD ) / 2 + $HEAD - 1 ))
+	fi
+
+	teardown
+	play
+}
+
+do_bad() {
+	setup
+
+	check_heads_n_tails
+
+	back
+	if [ $(( $HEAD + 1 )) -eq $TAIL ]; then
+		HEAD=$TAIL
+	else
+		HEAD=$(( ( $TAIL - $HEAD ) / 2 + $HEAD ))
+	fi
+
+	teardown
+	play
+}
+
+do_again() {
+	setup
+	play
+}
+
+do_start() {
+	do_clean
+
+	LEN="$(wc -l ${LOGFILE} | awk '{ print $1 }')"
+
+	HEAD=1
+	TAIL=$LEN
+
+	echo "assuming logfile contains the packets you seek... bisecting to first half"
+
+	teardown
+	play
+}
+
+do_where() {
+	setup
+	echo "between $HEAD and $TAIL (+$(( $TAIL - $HEAD ))) of $LOGFILE"
+}
+
+do_stop() {
+	setup
+
+	if [ "$COMMAND" == "no" ]; then
+		echo "failed to find what you were looking for"
+		exit 1
+	else
+		echo "the packets you seek are:"
+		do_where
+		exit 0
+	fi
+}
+
+do_clean() {
+	rm -rf .canplayer-bisect
+}
+
+if [ -z "$1" ]; then
+	usage
+	exit 1
+fi
+COMMAND=$1
+
+if [ ! -d .canplayer-bisect ] && [ ! -z "$2" ] && [ ! -e "$2" ]; then
+	usage
+	exit 1
+fi
+LOGFILE="$2"
+
+shift
+shift
+CANPLAYER_ARGS="$*"
+
+case "$COMMAND" in
+	start)
+		do_start
+	;;
+	stop)
+		do_stop
+	;;
+	clean)
+		do_clean
+	;;
+	good|yes)
+		do_good
+	;;
+	bad|no)
+		do_bad
+	;;
+	again)
+		do_again
+	;;
+	where)
+		do_where
+	;;
+	undo)
+		do_undo
+	;;
+	show)
+		do_show
+	;;
+esac
+

j1939_timedate/j1939_timedate_srv.c

@@ -41,7 +41,6 @@ static void gmtime_to_j1939_pgn_65254_td(struct j1939_time_date_packet *tdp)
 	utc_tm = gmtime_r(&now, &utc_tm_buf);
 	local_tm = localtime_r(&now, &local_tm_buf);
 
-	if (local_tm) {
 	/* Calculate the offsets */
 	hour_offset = local_tm->tm_hour - utc_tm->tm_hour;
 	minute_offset = local_tm->tm_min - utc_tm->tm_min;
@@ -53,11 +52,6 @@ static void gmtime_to_j1939_pgn_65254_td(struct j1939_time_date_packet *tdp)
 		else
 			hour_offset -= 24;  /* before midnight */
 	}
-	} else {
-		/* The local time offsets cannot be determined at the moment */
-		hour_offset = 0xF9;
-		minute_offset = 0xFF;
-	}		
 
 	/*
 	 * Seconds (spn959):

j1939_vehicle_position/j1939_vehicle_position_cmn.h

@@ -51,7 +51,7 @@ struct j1939_vp_err_msg {
 #define J1939_VP1_PRIO_DEFAULT				6
 #define J1939_VP1_MAX_TRANSFER_LENGH \
 	sizeof(struct j1939_vp1_packet)
-#define J1939_VP1_REPETITION_RATE_MS			1000
+#define J1939_VP1_REPETITION_RATE_MS			5000
 #define J1939_VP1_JITTER_MS				500
 
 /**
@@ -63,8 +63,8 @@ struct j1939_vp_err_msg {
  *           - Data Length: 4 bytes
  *           - Resolution: 10^-7 deg/bit
  *           - Offset: -210 degrees
- *           - Range: -210 to +211.10081215 degrees
+ *           - Range: -210 to +211.1008122 degrees
- *           - Operating Range: -210 degrees (SOUTH) to +211.1081215 degrees
+ *           - Operating Range: -210 degrees (SOUTH) to +211.108122 degrees
  *             (NORTH)
  *
  * @longitude: Raw longitude position of the vehicle
@@ -72,8 +72,8 @@ struct j1939_vp_err_msg {
  *           - Data Length: 4 bytes
  *           - Resolution: 10^-7 deg/bit
  *           - Offset: -210 degrees
- *           - Range: -210 to +211.10081215 degrees
+ *           - Range: -210 to +211.1008122 degrees
- *           - Operating Range: -210 degrees (WEST) to +211.1081215 degrees
+ *           - Operating Range: -210 degrees (WEST) to +211.108122 degrees
  *             (EAST)
  *
  * This structure defines each component of the Vehicle Position as described in
@@ -142,35 +142,32 @@ j1939_vp1_set_longitude(struct j1939_vp1_packet *packet, int32_t longitude)
 /**
  * struct j1939_vp2_packet - Represents the PGN 64502 Vehicle
  *                                         Position 2 packet
+ * FIXME: current packet layout is guessed based on limited information:
+ * https://www.isobus.net/isobus/pGNAndSPN/10801?type=PGN
  *
  * @total_satellites: Total number of satellites in view
  *           - SPN: 8128
  *           - Data Length: 1 byte
- *           - Range: 0 to 250
  *
  * @hdop: Horizontal dilution of precision
  *           - SPN: 8129
  *           - Data Length: 1 byte
  *           - Resolution: 0.1
- *           - Range: 0.0 to 25.0
  *
  * @vdop: Vertical dilution of precision
  *           - SPN: 8130
  *           - Data Length: 1 byte
  *           - Resolution: 0.1
- *           - Range: 0.0 to 25.0
  *
  * @pdop: Position dilution of precision
  *           - SPN: 8131
  *           - Data Length: 1 byte
  *           - Resolution: 0.1
- *           - Range: 0.0 to 25.0
  *
  * @tdop: Time dilution of precision
  *           - SPN: 8132
  *           - Data Length: 1 byte
  *           - Resolution: 0.1
- *           - Range: 0.0 to 25.0
  *
  * This structure defines each component of the Vehicle Position 2 as described
  * in PGN 64502.
@@ -181,9 +178,6 @@ struct j1939_vp2_packet {
 	uint8_t vdop;			  /* SPN 8130 */
 	uint8_t pdop;			  /* SPN 8131 */
 	uint8_t tdop;			  /* SPN 8132 */
-	uint8_t unused5;          /* Always 0xFF */
-	uint8_t unused6;          /* Always 0xFF */
-	uint8_t unused7;          /* Always 0xFF */
 } __attribute__((__packed__));
 
 /**

j1939_vehicle_position/j1939_vehicle_position_srv.c

@@ -270,12 +270,6 @@ static int j1939_vp2_get_data(struct j1939_vp_srv_priv *priv,
 	j1939_vp2_set_pdop(vp2p, pdop);
 	j1939_vp2_set_tdop(vp2p, tdop);
 
-	/* This PG's last 3 bytes are not assigned and hence must be set
-	 * to 0xFF as per J1939-71, section 5.2 */
-	vp2p->unused5 = 0xFF;
-	vp2p->unused6 = 0xFF;
-	vp2p->unused7 = 0xFF;
-
 	return 0;
 }
 

lib.c

@@ -170,23 +170,21 @@ int parse_canframe(char *cs, union cfu *cu)
 
 	memset(cu, 0, sizeof(*cu)); /* init CAN CC/FD/XL frame, e.g. LEN = 0 */
 
-	if (len >= 4 && cs[3] == CANID_DELIM) { /* 3 digits SFF CAN ID */
+	if (len < 4)
+		return 0;
 
-		idx = 4; /* start of frame data */
+	if (cs[3] == CANID_DELIM) { /* 3 digits SFF */
 
-		/* get 3 digits SFF CAN ID value */
+		idx = 4;
 		for (i = 0; i < 3; i++) {
 			if ((tmp = asc2nibble(cs[i])) > 0x0F)
 				return 0;
 			cu->cc.can_id |= tmp << (2 - i) * 4;
 		}
 
-	} else if (len >= 21 && cs[5] == CANID_DELIM && cs[20] == CANID_DELIM) {
+	} else if (cs[5] == CANID_DELIM) { /* 5 digits CAN XL VCID/PRIO*/
-		/* 5 digits CAN XL VCID/PRIO - but also check for 2nd '#' here */
 
-		idx = 6; /* start of CAN XL frame extra content (AF, SDT, etc) */
+		idx = 6;
-
-		/* get 5 digits CAN XL VCID/PRIO */
 		for (i = 0; i < 5; i++) {
 			if ((tmp = asc2nibble(cs[i])) > 0x0F)
 				return 0;
@@ -198,11 +196,9 @@ int parse_canframe(char *cs, union cfu *cu)
 		cu->xl.prio &= CANXL_PRIO_MASK;
 		cu->xl.prio |= tmp;
 
-	} else if (len >= 9 && cs[8] == CANID_DELIM) { /* 8 digits EFF CAN ID */
+	} else if (cs[8] == CANID_DELIM) { /* 8 digits EFF */
 
-		idx = 9; /* start of frame data */
+		idx = 9;
-
-		/* get 8 digits EFF CAN ID value */
 		for (i = 0; i < 8; i++) {
 			if ((tmp = asc2nibble(cs[i])) > 0x0F)
 				return 0;
@@ -243,12 +239,11 @@ int parse_canframe(char *cs, union cfu *cu)
 		cu->fd.flags |= CANFD_FDF; /* dual-use */
 		idx += 2;
 
-	} else if (idx == 6) { /* CAN XL frame extra content '#80:00:11223344#' */
+	} else if (cs[idx + 14] == CANID_DELIM) { /* CAN XL frame '#80:00:11223344#' */
 		maxdlen = CANXL_MAX_DLEN;
 		mtu = CANXL_MTU;
-		data = cu->xl.data; /* overwrite pointer to CAN XL data */
+		data = cu->xl.data; /* fill CAN XL data */
 
-		/* get CAN XL frame extra content */
 		if ((cs[idx + 2] != XL_HDR_DELIM) || (cs[idx + 5] != XL_HDR_DELIM))
 			return 0;
 
@@ -282,7 +277,6 @@ int parse_canframe(char *cs, union cfu *cu)
 		idx++; /* skip CANID_DELIM */
 	}
 
-	/* copy CAN frame data content */
 	for (i = 0, dlen = 0; i < maxdlen; i++) {
 		if (cs[idx] == DATA_SEPERATOR) /* skip (optional) separator */
 			idx++;