Merge b8239f1 into f79bd06

lpgauth · Oct 15, 2019 · bd866b9 · bd866b9
2 parents f79bd06 + b8239f1
commit bd866b9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,9 @@ language: erlang
 notifications:
   email: false
 otp_release:
-  - 21.0.3
+  - 22.1
+  - 22.0
+  - 21.3.8
   - 20.3
   - 19.3
   - 18.3

diff --git a/rebar.config b/rebar.config
@@ -28,7 +28,8 @@
 
 {erl_opts, [
   debug_info,
-  {platform_define, "19|^2", 'UDP_HEADER'}
+  {platform_define, "^18", 'UDP_HEADER_1'},
+  {platform_define, "^19|^20|^21|^22.0", 'UDP_HEADER_2'}
 ]}.
 
 {profiles, [

diff --git a/src/statsderl_udp.erl b/src/statsderl_udp.erl
@@ -3,6 +3,11 @@
 
 -compile(inline).
 -compile({inline_size, 512}).
+-compile({nowarn_unused_function, [{uint32, 1}]}).
+
+-ignore_xref([
+    {?MODULE, uint32, 1}
+]).
 
 -export([
     header/2
@@ -15,18 +20,29 @@
 -spec header(inet:ip_address(), inet:port_number()) ->
     iodata().
 
--ifdef(UDP_HEADER).
+-ifdef(UDP_HEADER_1).
+
+header(IP, Port) ->
+    [?INT16(Port), ip4_to_bytes(IP)].
+
+-else.
+-ifdef(UDP_HEADER_2).
 
 header(IP, Port) ->
-    [?INET_AF_INET, ?INT16(Port) | ip4_to_bytes(IP)].
+    [?INET_AF_INET, ?INT16(Port), ip4_to_bytes(IP)].
 
 -else.
 
 header(IP, Port) ->
-    [?INT16(Port) | ip4_to_bytes(IP)].
+    [?INET_AF_INET, ?INT16(Port), ip4_to_bytes(IP), uint32(0)].
 
 -endif.
+-endif.
 
 %% private
 ip4_to_bytes({A, B, C, D}) ->
     [A band 16#ff, B band 16#ff, C band 16#ff, D band 16#ff].
+
+uint32(X) ->
+    [((X) bsr 24) band 16#ff, ((X) bsr 16) band 16#ff,
+     ((X) bsr 8) band 16#ff, (X) band 16#ff].