Skip to content

Commit

Permalink
WinDivert 2.0.1-rc bugfix release.
Browse files Browse the repository at this point in the history
  • Loading branch information
basil00 committed Jul 6, 2019
1 parent db7f80d commit 02541ce
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 9 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -291,3 +291,9 @@ WinDivert 2.0.0-rc
values correspond to higher priorities.
- The last two arguments for WinDivertRecv() and WinDivertSend() have been
swapped.
WinDivert 2.0.1-rc
- Fix WFP callout install optimization bug.
- Fix WinDivertHelperNtohIpv6Address/WinDivertHelperHtonIpv6Address bug.
- Rename the following functions for consistency:
* WinDivertHelperNtohIpv6Address -> WinDivertHelperNtohIPv6Address
* WinDivertHelperHtonIpv6Address -> WinDivertHelperHtonIPv6Address
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0-rc
2.0.1-rc
2 changes: 2 additions & 0 deletions dll/windivert.def
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ EXPORTS
WinDivertHelperHtonll
WinDivertHelperNtohIPv6Address
WinDivertHelperHtonIPv6Address
WinDivertHelperNtohIpv6Address
WinDivertHelperHtonIpv6Address
9 changes: 9 additions & 0 deletions dll/windivert_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -5055,3 +5055,12 @@ extern void WinDivertHelperHtonIPv6Address(const UINT *inAddr, UINT *outAddr)
WinDivertByteSwap128(inAddr, outAddr);
}

// Old names to be removed in next version
extern void WinDivertHelperNtohIpv6Address(const UINT *inAddr, UINT *outAddr)
{
WinDivertByteSwap128(inAddr, outAddr);
}
extern void WinDivertHelperHtonIpv6Address(const UINT *inAddr, UINT *outAddr)
{
WinDivertByteSwap128(inAddr, outAddr);
}
16 changes: 8 additions & 8 deletions doc/windivert.html
Original file line number Diff line number Diff line change
Expand Up @@ -2299,7 +2299,7 @@ <h2>Table of Contents</h2>
If <code>pAddr</code> is non-<code>NULL</code>, the buffer assumed
to be large enough to hold a 16-byte IPv6 address.
The result is stored in host-byte-order.
Use <a href="#divert_helper_hton"><code>WinDivertHelperHtonIpv6Address()</code></a>
Use <a href="#divert_helper_hton"><code>WinDivertHelperHtonIPv6Address()</code></a>
to convert the result into network-byte-order.
</p>
</dd></dl>
Expand Down Expand Up @@ -2591,7 +2591,7 @@ <h2>Table of Contents</h2>
UINT64 <b>WinDivertHelperNtohll</b>(
__in UINT64 x
);
void <b>WinDivertHelperNtohIpv6Address</b>(
void <b>WinDivertHelperNtohIPv6Address</b>(
__in const UINT *inAddr,
__out UINT *outAddr
);
Expand Down Expand Up @@ -2626,7 +2626,7 @@ <h2>Table of Contents</h2>
UINT64 <b>WinDivertHelperHtonll</b>(
__in UINT64 x
);
void <b>WinDivertHelperHtonIpv6Address</b>(
void <b>WinDivertHelperHtonIPv6Address</b>(
__in const UINT *inAddr,
__out UINT *outAddr
);
Expand Down Expand Up @@ -2849,11 +2849,11 @@ <h2>Table of Contents</h2>
for the <code>SOCKET</code> layer, or
<code>WINDIVERT_EVENT_REFLECT_CLOSE</code> for the <code>REFLECT</code>
layer.</td></tr>
<tr><td><code>NETWORK</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_FLOW_NETWORK</code></td></tr>
<tr><td><code>NETWORK_FORWARD</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_FLOW_NETWORK_FORWARD</code></td></tr>
<tr><td><code>FLOW</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_FLOW_FLOW</code></td></tr>
<tr><td><code>SOCKET</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_FLOW_SOCKET</code></td></tr>
<tr><td><code>REFLECT</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_FLOW_REFLECT</code></td></tr>
<tr><td><code>NETWORK</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_NETWORK</code></td></tr>
<tr><td><code>NETWORK_FORWARD</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_NETWORK_FORWARD</code></td></tr>
<tr><td><code>FLOW</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_FLOW</code></td></tr>
<tr><td><code>SOCKET</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_SOCKET</code></td></tr>
<tr><td><code>REFLECT</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_REFLECT</code></td></tr>
</table>
</center>

Expand Down
10 changes: 10 additions & 0 deletions include/windivert.h
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,16 @@ extern WINDIVERTEXPORT void WinDivertHelperHtonIPv6Address(
__in const UINT *inAddr,
__out UINT *outAddr);

/*
* Old names to be removed in the next version.
*/
extern WINDIVERTEXPORT void WinDivertHelperNtohIpv6Address(
__in const UINT *inAddr,
__out UINT *outAddr);
extern WINDIVERTEXPORT void WinDivertHelperHtonIpv6Address(
__in const UINT *inAddr,
__out UINT *outAddr);

#endif /* WINDIVERT_KERNEL */

#ifdef __cplusplus
Expand Down

0 comments on commit 02541ce

Please sign in to comment.