Merge pull request #280 from LinuxJedi/native-can-isotp

Alter ISO-TP example to use wolfSSL native

Author: dgarske

.gitmodules

@@ -16,6 +16,3 @@
 [submodule "android/wolfcryptjni-ndk-gradle/wolfcrypt-jni"]
 	path = android/wolfcryptjni-ndk-gradle/wolfcrypt-jni
 	url = https://github.com/wolfssl/wolfcrypt-jni
-[submodule "can-bus/isotp-c"]
-	path = can-bus/isotp-c
-	url = https://github.com/lishen2/isotp-c

can-bus/Makefile

@@ -1,16 +1,13 @@
 CC=gcc
 LIBS=-lwolfssl
-CFLAGS=-Iisotp-c -Wno-cpp -Wall -Wextra -Wdeclaration-after-statement
+CFLAGS=-g -Wno-cpp -Wall -Wextra -Wpedantic -Wdeclaration-after-statement
 
-COMMON_OBJS=isotp-c/isotp.o common.o
+COMMON_OBJS=common.o
 CLIENT_OBJS=client.o
 SERVER_OBJS=server.o
 
 all: client server
 
-isotp-c/isotp.o: isotp-c/isotp.c
-	@$(CC) -c $< -o $@
-
 %.o: %.c
 	@$(CC) -c $< -o $@ $(CFLAGS)
 
@@ -24,4 +21,3 @@ clean:
 	@rm -f *.o
 	@rm -f client
 	@rm -f server
-	@rm -f isotp-c/isotp.o

can-bus/README.md

@@ -4,7 +4,7 @@ This example implements a simple echo client and server that uses TLS over a CAN
 
 ## Building
 
-You need to have wolfSSL installed on your computer prior to building. If you haven't already you will also need to get the git submodules for this tree, you can do this by using `git submodule update --init`. A simple `make` will then build the source files.
+You need to have wolfSSL installed on your computer prior to building, this will need to be built with `WOLFSSL_ISOTP` defined to provide ISO-TP functionality.
 
 To generate the required SSL certificates use `./generate_ssl.sh`.
 
@@ -13,7 +13,7 @@ To generate the required SSL certificates use `./generate_ssl.sh`.
 If you do not have a physical CAN bus between too machines you can use the virtual CAN bus which is a Linux kernel module. This behaves just like a real CAN bus with a similar bandwidth. To enable this run the following commands:
 
 ```sh
-modprobe vcan
+sudo modprobe vcan
 sudo ip link add dev vcan0 type vcan
 sudo ip link set vcan0 up
 ```
@@ -32,29 +32,9 @@ Then in another terminal run the client:
 server vcan0
 ```
 
-On the client you will see (byte numbers will vary):
+On both ends you will see:
 
 ```
-Sending 242 bytes
-Receiving 128 bytes
-Receiving 28 bytes
-Receiving 974 bytes
-Receiving 286 bytes
-Receiving 58 bytes
-Sending 58 bytes
-SSL handshake done!
-```
-
-And on the server:
-
-```
-Receiving 242 bytes
-Sending 128 bytes
-Sending 28 bytes
-Sending 974 bytes
-Sending 286 bytes
-Sending 58 bytes
-Receiving 58 bytes
 SSL handshake done!
 ```
 
@@ -66,14 +46,12 @@ For example, on the client if we type "Hello world, this is a TLS test!":
 Hello world! This is a CAN bus test!
 Sending: Hello world! This is a CAN bus test!
 
-Sending 59 bytes
 Message sent
 ```
 
 The server will echo:
 
 ```
-Receiving 59 bytes
 Got message: Hello world! This is a CAN bus test!
 ```
 

can-bus/client.c

@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
     int ret;
 
     if (argc != 2) {
-        printf("Usage: ./transmit <CAN interface>\n");
+        printf("Usage: ./client <CAN interface>\n");
         return -1;
     }