References: <rt-4.2.8-62213-1485427934-1350.0-0-0@isc.org>
 <RT-Ticket-44535@isc.org>
X-RT-Interface: Web
In-Reply-To: <rt-4.2.8-62213-1485427934-1350.0-0-0@isc.org>
Content-Transfer-Encoding: binary
Message-ID: <rt-4.4.1-53617-1513771095-177.44535-0-0@isc.org>
Content-Disposition: inline
X-RT-Original-Encoding: utf-8
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
X-Mailer: MIME-tools 5.508 (Entity 5.508)
RT-Send-CC:
Content-Length: 801

By patch comments (in the order I integrated them):
 server-v4:
  * uint16_t -> u_int16_t (the code is older than C99)

 server-v6:
  * D6O_RELAY_PORT -> D6O_RELAY_SOURCE_PORT

  * 90 -> 135

  * "Relay Port." (in messages) -> "Relay Source Port."

 I have two concerns about:
+               /* Check relay source port */
+               if (packet->relay_source_port && packet->client_port != 547) {
+                       to_addr.sin6_port = packet->client_port;
+               }

First as the to_addr.sin6_port is always local_port so 547,
second 547 is host byte order when packet->client_port
is network byte order so the wrong test is useless if
the relay doesn't use port 8962...
I removed the second part leaving only packet->relay_source_port
but I'd like to get your opinion about this.