From 9923765c0a5ea9e2ff521cf11750ea5e518aed5e Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@google.com>
Date: Wed, 29 May 2019 16:10:54 +0200
Subject: [PATCH] Specify that we need TCP and not UDP connection

Relevant man pages say that with our previous
code libc might return either. Glibc returns tcp but
bionic returns udp. So specify it explicitly
---
 uart/uart_posix.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index ba948132e..915878e37 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -90,7 +90,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
     timeout.tv_usec = UART_FPC_CLIENT_RX_TIMEOUT_MS * 1000;
 
     if (memcmp(pcPortName, "tcp:", 4) == 0) {
-        struct addrinfo *addr, *rp;
+        struct addrinfo *addr = NULL, *rp;
         char *addrstr = strdup(pcPortName + 4);
 
         if (addrstr == NULL) {
@@ -110,7 +110,13 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
             portstr = "7901";
         }
 
-        int s = getaddrinfo(addrstr, portstr, NULL, &addr);
+        struct addrinfo info;
+
+        memset (&info, 0, sizeof(info));
+
+        info.ai_socktype = SOCK_STREAM;
+
+        int s = getaddrinfo(addrstr, portstr, &info, &addr);
         if (s != 0) {
             printf("Error: getaddrinfo: %s\n", gai_strerror(s));
             freeaddrinfo(addr);