Merge pull request #524 from openziti/fix-binding-parameters

make sure terminator cost and precedence headers use expected sizes

Author: ekoby

library/connect.c

@@ -1117,8 +1117,8 @@ static int ziti_channel_start_connection(struct ziti_conn *conn, ziti_channel_t
             if (req->listen_opts != NULL) {
                 ziti_listen_opts *opts = req->listen_opts;
                 char *identity = opts->identity;
-                int term_cost = get_terminator_cost(opts, conn->conn_req->service_id, conn->ziti_ctx);
-                int term_prec = get_terminator_precedence(opts, conn->conn_req->service_id, conn->ziti_ctx);
+                uint16_t term_cost = get_terminator_cost(opts, conn->conn_req->service_id, conn->ziti_ctx);
+                uint8_t term_prec = get_terminator_precedence(opts, conn->conn_req->service_id, conn->ziti_ctx);
 
                 if (opts->bind_using_edge_identity) {
                     if (opts->identity != NULL) {
@@ -1135,17 +1135,16 @@ static int ziti_channel_start_connection(struct ziti_conn *conn, ziti_channel_t
                     nheaders++;
                 }
                 if (term_cost > 0) {
-                    int32_t cost = htole32(term_cost);
+                    uint16_t cost = htole16(term_cost);
                     headers[nheaders].header_id = CostHeader;
                     headers[nheaders].value = (uint8_t *) &cost;
                     headers[nheaders].length = sizeof(cost);
                     nheaders++;
                 }
                 if (term_prec != PRECEDENCE_DEFAULT) {
-                    int32_t precedence = htole32(term_prec);
                     headers[nheaders].header_id = PrecedenceHeader;
-                    headers[nheaders].value = (uint8_t *) &precedence;
-                    headers[nheaders].length = sizeof(precedence);
+                    headers[nheaders].value = &term_prec;
+                    headers[nheaders].length = sizeof(term_prec);
                     nheaders++;
                 }
             }

library/endian_internal.h

@@ -1,18 +1,16 @@
-/*
-Copyright 2019-2020 NetFoundry, Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+// Copyright (c) 2023.  NetFoundry Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 #ifndef ZITI_SDK_ENDIAN_INTERNAL_H
 #define ZITI_SDK_ENDIAN_INTERNAL_H
@@ -26,6 +24,7 @@ limitations under the License.
 #  include <endian.h>
 #elif defined (__APPLE__)
 #  include <libkern/OSByteOrder.h>
+#  define htole16(x) OSSwapHostToLittleInt16(x)
 #  define htole32(x) OSSwapHostToLittleInt32(x)
 #  define htole64(x) OSSwapHostToLittleInt64(x)
 #  define le32toh(x) OSSwapLittleToHostInt32(x)