Merge pull request #291 from keepkey/change-emulator-port

Change emulator port
keepkey · Aug 2, 2021 · 917f792 · 917f792
2 parents 717b61d + 089fc59
commit 917f792
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/deps/python-keepkey b/deps/python-keepkey
diff --git a/lib/emulator/udp.c b/lib/emulator/udp.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <sys/socket.h>
 
-#define TREZOR_UDP_PORT 21324
+#define KEEPKEY_UDP_PORT 11044
 
 struct usb_socket {
   int fd;
@@ -95,9 +95,9 @@ static size_t socket_read(struct usb_socket *sock, void *buffer, size_t size) {
 }
 
 void emulatorSocketInit(void) {
-  usb_main.fd = socket_setup(TREZOR_UDP_PORT);
+  usb_main.fd = socket_setup(KEEPKEY_UDP_PORT);
   usb_main.fromlen = 0;
-  usb_debug.fd = socket_setup(TREZOR_UDP_PORT + 1);
+  usb_debug.fd = socket_setup(KEEPKEY_UDP_PORT + 1);
   usb_debug.fromlen = 0;
 }
 

diff --git a/scripts/emulator/Dockerfile b/scripts/emulator/Dockerfile
@@ -12,7 +12,7 @@ RUN cmake -C ./cmake/caches/emulator.cmake . \
 
 RUN make -j
 
-EXPOSE 21324/udp 21325/udp
+EXPOSE 11044/udp 11045/udp
 EXPOSE 5000
 CMD ["/kkemu/scripts/emulator/run.sh"]
 
diff --git a/scripts/emulator/bridge.py b/scripts/emulator/bridge.py
@@ -9,8 +9,8 @@
 
 PACKET_SIZE = 64
 
-main = ('0.0.0.0', 21324)
-debug = ('0.0.0.0', 21325)
+main = ('0.0.0.0', 11044)
+debug = ('0.0.0.0', 11045)
 
 ms = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 ms.connect(main)

diff --git a/scripts/emulator/docker-compose.yml b/scripts/emulator/docker-compose.yml
@@ -8,8 +8,8 @@ services:
     networks:
       - local-net
     ports:
-      - "127.0.0.1:21324:21324/udp"
-      - "127.0.0.1:21325:21325/udp"
+      - "127.0.0.1:11044:11044/udp"
+      - "127.0.0.1:11045:11045/udp"
       - "127.0.0.1:5000:5000"
   python-keepkey:
     build:

diff --git a/scripts/emulator/python-keepkey-tests.sh b/scripts/emulator/python-keepkey-tests.sh
@@ -2,5 +2,5 @@
 
 mkdir -p /kkemu/test-reports/python-keepkey
 cd deps/python-keepkey/tests
-KK_TRANSPORT_MAIN=kkemu:21324 KK_TRANSPORT_DEBUG=kkemu:21325 pytest -v --junitxml=/kkemu/test-reports/python-keepkey/junit.xml
+KK_TRANSPORT_MAIN=kkemu:11044 KK_TRANSPORT_DEBUG=kkemu:11045 pytest -v --junitxml=/kkemu/test-reports/python-keepkey/junit.xml
 echo "$?" > /kkemu/test-reports/python-keepkey/status