Formatted and fix minor fixes

This commit is contained in:
Eishun Kondoh 2018-03-17 22:43:58 +09:00
parent 442fe2eaa4
commit 112e0ce4b5
4 changed files with 14 additions and 8 deletions

View file

@ -993,20 +993,22 @@ defmodule Openflow.Enums do
to_int_fn_name = String.to_atom(enum_name <> "_to_int") to_int_fn_name = String.to_atom(enum_name <> "_to_int")
to_atom_fn_name = String.to_atom(enum_name <> "_to_atom") to_atom_fn_name = String.to_atom(enum_name <> "_to_atom")
for {key, value} <- enum_def do for {key, _value} <- enum_def do
def to_int(unquote(key), unquote(String.to_atom(enum_name))) do def to_int(unquote(key), unquote(String.to_atom(enum_name))) do
try do try do
unquote(to_int_fn_name)(unquote(key)) unquote(to_int_fn_name)(unquote(key))
catch catch
_ -> unquote(key) :throw, _ -> unquote(key)
end
end end
end end
for {_key, value} <- enum_def do
def to_atom(unquote(value), unquote(String.to_atom(enum_name))) do def to_atom(unquote(value), unquote(String.to_atom(enum_name))) do
try do try do
unquote(to_atom_fn_name)(unquote(value)) unquote(to_atom_fn_name)(unquote(value))
catch catch
_ -> unquote(value) :throw, _ -> unquote(value)
end end
end end
end end

View file

@ -1,7 +1,8 @@
defmodule Tres.Controller do defmodule Tres.Controller do
def controller_helpers do def controller_helpers do
quote do quote do
import Tres.SwitchRegistry, only: [ import Tres.SwitchRegistry,
only: [
send_message: 2, send_message: 2,
get_current_xid: 1 get_current_xid: 1
] ]

View file

@ -124,10 +124,12 @@ defmodule Tres.SecureChannel do
defp init_handler(state_data) do defp init_handler(state_data) do
%State{datapath_id: dpid, aux_id: aux_id} = state_data %State{datapath_id: dpid, aux_id: aux_id} = state_data
case MessageHandlerSup.start_child({dpid, aux_id}) do case MessageHandlerSup.start_child({dpid, aux_id}) do
{:ok, pid} -> {:ok, pid} ->
ref = Process.monitor(pid) ref = Process.monitor(pid)
%{state_data | handler_pid: pid, handler_ref: ref} %{state_data | handler_pid: pid, handler_ref: ref}
{:error, reason} -> {:error, reason} ->
{:stop, reason} {:stop, reason}
end end
@ -210,6 +212,7 @@ defmodule Tres.SecureChannel do
%State{} = new_state_data -> %State{} = new_state_data ->
start_periodic_idle_check() start_periodic_idle_check()
{:keep_state, new_state_data} {:keep_state, new_state_data}
{:stop, reason} -> {:stop, reason} ->
close_connection({:handler_down, reason}, state_data) close_connection({:handler_down, reason}, state_data)
end end

View file

@ -27,7 +27,7 @@ defmodule Tres.SwitchRegistry do
end end
def get_current_xid({_dpid, _aux_id} = datapath_id) do def get_current_xid({_dpid, _aux_id} = datapath_id) do
[{pid, _}|_] = Registry.lookup(__MODULE__, datapath_id) [{pid, _} | _] = Registry.lookup(__MODULE__, datapath_id)
:gen_statem.call(pid, :get_xid, 1000) :gen_statem.call(pid, :get_xid, 1000)
end end