Use iplib instead of ip

ates · Aug 7, 2012 · 1791f67 · 1791f67
1 parent 72d111b
commit 1791f67
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/iptraffic_session.erl b/src/iptraffic_session.erl
@@ -221,8 +221,8 @@ process_netflow_packet(_Pdu) ->
     ?WARNING_MSG("Unsupported NetFlow version~n", []).
 
 match_record(H, Rec) ->
-    SrcIP = ip:long2ip(Rec#nfrec_v5.src_addr),
-    DstIP = ip:long2ip(Rec#nfrec_v5.dst_addr),
+    SrcIP = iplib:long2ip(Rec#nfrec_v5.src_addr),
+    DstIP = iplib:long2ip(Rec#nfrec_v5.dst_addr),
     case match_session(SrcIP, DstIP) of
         {ok, Matches} ->
             Fun = fun({Dir, Session}) ->
@@ -264,8 +264,8 @@ build_iptraffic_args(H, Rec, Direction) when is_record(H, nfh_v5) ->
     {_Days, Time} = calendar:seconds_to_daystime(H#nfh_v5.unix_secs),
     Args = #ipt_args{
         sec = calendar:time_to_seconds(Time),
-        src_ip = ip:long2ip(Rec#nfrec_v5.src_addr),
-        dst_ip = ip:long2ip(Rec#nfrec_v5.dst_addr),
+        src_ip = iplib:long2ip(Rec#nfrec_v5.src_addr),
+        dst_ip = iplib:long2ip(Rec#nfrec_v5.dst_addr),
         src_port = Rec#nfrec_v5.src_port,
         dst_port = Rec#nfrec_v5.dst_port,
         proto = Rec#nfrec_v5.prot,

diff --git a/src/iptraffic_tariffs.erl b/src/iptraffic_tariffs.erl
@@ -56,8 +56,8 @@ match_rule(any, _) ->
 match_rule(Rule, Args) ->
     match_time(Rule#netflow_rule.time, Args#ipt_args.sec) andalso
     (Rule#netflow_rule.dir == Args#ipt_args.dir orelse Rule#netflow_rule.dir == any) andalso
-    ip:in_range(Args#ipt_args.src_ip, Rule#netflow_rule.src_net) andalso
-    ip:in_range(Args#ipt_args.dst_ip, Rule#netflow_rule.dst_net) andalso
+    iplib:in_range(Args#ipt_args.src_ip, Rule#netflow_rule.src_net) andalso
+    iplib:in_range(Args#ipt_args.dst_ip, Rule#netflow_rule.dst_net) andalso
     (Rule#netflow_rule.src_port == Args#ipt_args.src_port orelse Rule#netflow_rule.src_port == any) andalso
     (Rule#netflow_rule.dst_port == Args#ipt_args.dst_port orelse Rule#netflow_rule.dst_port == any) andalso
     (Rule#netflow_rule.proto == Args#ipt_args.proto orelse Rule#netflow_rule.proto == any).