gen_netlink API changed

* all messages in a netlink event are sent as one erlang message to the subscriber * the done message at the end of multipart messages is included in these messages to the subscriber * the name of no subsystem has been changed to "netlink", so a #netlink record is created by the encoding routines
travelping · Sep 29, 2011 · d8c8c7a · d8c8c7a
1 parent 995aee3
commit d8c8c7a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 16 deletions.
diff --git a/include/netlink.hrl b/include/netlink.hrl
@@ -37,9 +37,18 @@
 -type rtnetlink_prefix() :: {family(),ifindex(),non_neg_integer(),non_neg_integer(),nl_flags(),nla()}.
 -type rtnetlink_msg() :: rtnetlink_neigh() | rtnetlink_route() | rtnetlink_addr() | rtnetlink_link() | rtnetlink_prefix().
 
+%% no subsystem
+-record(netlink, {
+          type          :: noop | error | done | overrun,
+          flags         :: nl_flags(),
+          seq           :: non_neg_integer(),
+          pid           :: non_neg_integer(),
+          msg
+        }).
+
 -record(rtnetlink, {
 		  type          ::atom(),
-		  flags         ::list(atom()),
+		  flags         ::nl_flags(),
 		  seq           ::non_neg_integer(),
 		  pid           ::non_neg_integer(),
 		  msg           ::rtnetlink_msg()
@@ -60,3 +69,11 @@
 		  pid           ::non_neg_integer(),
 		  msg           ::ctnetlink_msg()
 		 }).
+
+-type ctnetlink_ev() :: {ctnetlink, [#ctnetlink{} | #ctnetlink_exp{} | #netlink{}, ...]}.
+                     %% type of messages sent to `ct' subscriber
+-type rtnetlink_ev() :: {rtnetlink, [#rtnetlink{}, ...]}.
+                     %% type of messages sent to `rt' subscriber
+                     %% messages with no subsystem are decoded as #rtnetlink!
+                     %% multipart messages are terminates by #rtnetlink{type = done}
+
diff --git a/src/netlink.erl b/src/netlink.erl
@@ -165,15 +165,15 @@ enc_opt(rtnlgrp_phonet_route)          -> ?RTNLGRP_PHONET_ROUTE.
 -define(NFNL_SUBSYS_COUNT,5).
 
 %% grep "^-define(NFNL_SUB" src/netlink.erl | awk -F"[(,]" '{ printf "nfnl_subsys(?%s)%*s %s;\n", $2, 32 - length($2), "->", tolower(substr($2,13)) }'
-nfnl_subsys(?NFNL_SUBSYS_NONE)              -> none;
+nfnl_subsys(?NFNL_SUBSYS_NONE)              -> netlink;
 nfnl_subsys(?NFNL_SUBSYS_CTNETLINK)         -> ctnetlink;
 nfnl_subsys(?NFNL_SUBSYS_CTNETLINK_EXP)     -> ctnetlink_exp;
 nfnl_subsys(?NFNL_SUBSYS_QUEUE)             -> queue;
 nfnl_subsys(?NFNL_SUBSYS_ULOG)              -> ulog;
 nfnl_subsys(?NFNL_SUBSYS_COUNT)             -> count;
 nfnl_subsys(SubSys) when is_integer(SubSys) -> SubSys;
 
-nfnl_subsys(none)              -> ?NFNL_SUBSYS_NONE;
+nfnl_subsys(netlink)           -> ?NFNL_SUBSYS_NONE;
 nfnl_subsys(ctnetlink)         -> ?NFNL_SUBSYS_CTNETLINK;
 nfnl_subsys(ctnetlink_exp)     -> ?NFNL_SUBSYS_CTNETLINK_EXP;
 nfnl_subsys(queue)             -> ?NFNL_SUBSYS_QUEUE;
@@ -350,7 +350,7 @@ define_consts() ->
                     {dormant, flag},
                     {echo, flag}
                  ]},
-	 {{ctm_msgtype, none}, [
+	 {{ctm_msgtype, netlink}, [
 							{noop,         {flag, ?NLMSG_NOOP}},
 							{error,        {flag, ?NLMSG_ERROR}},
 							{done,         {flag, ?NLMSG_DONE}},
@@ -1161,9 +1161,9 @@ subscribe(Pid, Types) ->
     gen_server:call(?MODULE, {subscribe, #subscription{pid = Pid, types = Types}}).
 
 handle_call({subscribe, #subscription{pid = Pid} = Subscription}, _From, #state{subscribers = Sub} = State) ->
-    case lists:keymember(Pid, 2, Sub) of
+    case lists:keymember(Pid, #subscription.pid, Sub) of
         true ->
-            NewSub = lists:keyreplace(Pid, 2, Sub, Subscription),
+            NewSub = lists:keyreplace(Pid, #subscription.pid, Sub, Subscription),
             {reply, ok, State#state{subscribers = NewSub}};
         false ->
             io:format("~p:Subscribe ~p~n", [?MODULE, Pid]),
@@ -1195,14 +1195,14 @@ handle_info({udp, Ct, _IP, _port, Data}, #state{ct = Ct, rt = _Rt, subscribers =
     Subs = lists:filter(fun(Elem) ->
                                 lists:member(ct, Elem#subscription.types)
                         end, Sub),
-    spawn(?MODULE, notify, [ct, Subs, nl_ct_dec_udp(Data)]),
+    spawn(?MODULE, notify, [ctnetlink, Subs, nl_ct_dec_udp(Data)]),
     {noreply, State};
 handle_info({udp, Rt, _IP, _Port, Data}, #state{rt = Rt, ct = _Ct, subscribers = Sub} = State) ->
     %% io:format("got ~p~ndec: ~p~n", [Data, nl_rt_dec_udp(Data)]),
     Subs = lists:filter(fun(Elem) ->
                                 lists:member(rt, Elem#subscription.types)
                         end, Sub),
-    spawn(?MODULE, notify, [rt, Subs, nl_rt_dec_udp(Data)]),
+    spawn(?MODULE, notify, [rtnetlink, Subs, nl_rt_dec_udp(Data)]),
     {noreply, State};
 handle_info({udp, S, _IP, _Port, _Data}, #state{subscribers = Sub} = State) ->
     %% io:format("got on Socket ~p~n", [S]),
@@ -1227,12 +1227,6 @@ terminate(Reason, _State) ->
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
 
-notify(SubSys, Pids, Msgs)
-  when is_list(Msgs) ->
-	lists:foreach(fun(Msg) -> notify(SubSys, Pids, Msg) end, Msgs);
-notify(_, _Pids, Msg)
-  when is_tuple(Msg), element(2, Msg) == done ->
-	ok;
-notify(_, Pids, Msg) ->
-	lists:foreach(fun(Pid) -> Pid#subscription.pid ! Msg end, Pids).
+notify(SubSys, Pids, Msgs) ->
+    lists:foreach(fun(Pid) -> Pid#subscription.pid ! {SubSys, Msgs} end, Pids).