Merge pull request #55 from openziti/tcp-half-close

ekoby · web-flow · commit 542ae66cb626 · 2020-10-28T16:06:02.000-04:00
fix crash
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
@@ -2,7 +2,7 @@ include(FetchContent)
 
 FetchContent_Declare(ziti-sdk-c
         GIT_REPOSITORY https://github.com/openziti/ziti-sdk-c.git
-        GIT_TAG 0.16.3
+        GIT_TAG 0.16.4
         )
 set(ZITI_BUILD_TESTS off)
 set(ZITI_BUILD_PROGRAMS off)
diff --git a/lib/dns.c b/lib/dns.c
@@ -65,6 +65,7 @@ const char* assign_ip(const char *hostname) {
         fprintf(stderr, "WARN: DNS assignment space is exhausted");
     }
     snprintf(e->ip, MAX_IP_LENGTH, "%d.%d.%d.%d", addr>>24U, (addr>>16U) & 0xFFU, (addr>>8U)&0xFFU, addr&0xFFU);
+    snprintf(e->hostname, sizeof(e->hostname), "%s",hostname);
 
     LIST_INSERT_HEAD(&ip_cache.entries, e, _next);
     return e->ip;

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ include(FetchContent)`
`2`	`2`
`3`	`3`	`FetchContent_Declare(ziti-sdk-c`
`4`	`4`	`GIT_REPOSITORY https://github.com/openziti/ziti-sdk-c.git`
`5`		`- GIT_TAG 0.16.3`
	`5`	`+ GIT_TAG 0.16.4`
`6`	`6`	`)`
`7`	`7`	`set(ZITI_BUILD_TESTS off)`
`8`	`8`	`set(ZITI_BUILD_PROGRAMS off)`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ const char* assign_ip(const char *hostname) {`
`65`	`65`	`fprintf(stderr, "WARN: DNS assignment space is exhausted");`
`66`	`66`	`}`
`67`	`67`	`snprintf(e->ip, MAX_IP_LENGTH, "%d.%d.%d.%d", addr>>24U, (addr>>16U) & 0xFFU, (addr>>8U)&0xFFU, addr&0xFFU);`
	`68`	`+ snprintf(e->hostname, sizeof(e->hostname), "%s",hostname);`
`68`	`69`
`69`	`70`	`LIST_INSERT_HEAD(&ip_cache.entries, e, _next);`
`70`	`71`	`return e->ip;`