From a7268044610bf887ab7675ee0f96e802778a3b5c Mon Sep 17 00:00:00 2001
From: Michael Santos <michael.santos@gmail.com>
Date: Thu, 4 Nov 2010 10:47:14 -0400
Subject: [PATCH] Remove debug dumps; log session start and end

Remove packet dumps and adjust logging of start and end of sessions.
Also, remove useless conversion of list to binary.
---
 seds/src/seds.erl       | 15 ++++-----------
 seds/src/seds_proxy.erl | 33 +++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/seds/src/seds.erl b/seds/src/seds.erl
index a1fc0c0..bbb83f4 100644
--- a/seds/src/seds.erl
+++ b/seds/src/seds.erl
@@ -137,24 +137,17 @@ code_change(_OldVsn, State, _Extra) ->
 %%%
 %%% Internal Functions
 %%%
-proxy({{ServerIP, ServerPort}, SessionId} = Session, #state{
+proxy({{IP, Port}, Id} = Session, #state{
         s = Socket,
         p = Proxies
     }) ->
     case dict:find(Session, Proxies) of
         error ->
             error_logger:info_report([
-                    {proxy, starting},
-                    {socket, Socket},
-                    {id, SessionId},
-
-                    {serverip, ServerIP},
-                    {serverport, ServerPort}
+                    {session_start, {IP, Port}},
+                    {id, Id}
                 ]),
-            {ok, Pid} = seds_proxy:start_link(
-                Socket,
-                {ServerIP, ServerPort}
-            ),
+            {ok, Pid} = seds_proxy:start_link(Socket, {IP, Port}),
             {Pid, dict:store(Session, Pid, Proxies)};
         {ok, Pid} ->
             {Pid, Proxies}
diff --git a/seds/src/seds_proxy.erl b/seds/src/seds_proxy.erl
index 0bfae60..1053e9d 100644
--- a/seds/src/seds_proxy.erl
+++ b/seds/src/seds_proxy.erl
@@ -107,7 +107,17 @@ handle_info({tcp, Socket, Data}, proxy, #state{s = Socket} = State) ->
 handle_info({tcp_closed, Socket}, proxy, #state{s = Socket} = State) ->
     {stop, shutdown, State}.
 
-terminate(_Reason, _StateName, _State) ->
+terminate(Reason, StateName, #state{
+        ip = IP,
+        port = Port,
+        sum = Sum
+    }) ->
+    error_logger:info_report([
+            {session_end, {IP, Port}},
+            {bytes_sent, Sum},
+            {state, StateName},
+            {reason, Reason}
+        ]),
     ok.
 
 code_change(_OldVsn, StateName, State, _Extra) ->
@@ -143,11 +153,11 @@ proxy({dns_query, IP, Port,
         s = Socket
     } = State) ->
 
-    Payload = list_to_binary(base32:decode(string:to_upper(Data))),
+    Payload = base32:decode(string:to_upper(Data)),
 
     ok = gen_tcp:send(Socket, Payload),
 
-    Sum1 = Sum + byte_size(Payload),
+    Sum1 = Sum + length(Payload),
 
     Packet = inet_dns:encode(
         Rec#dns_rec{
@@ -164,21 +174,20 @@ proxy({dns_query, IP, Port,
 
     error_logger:info_report([
             {direction, up},
-            {dns_query, Rec},
-            {data, Data},
-            {base64, Payload},
-            {packet, Packet}
+            {dns_query, Rec}
         ]),
 
     ok = gen_udp:send(DNSSocket, IP, Port, Packet),
     {next_state, proxy, State, ?PROXY_TIMEOUT};
-proxy({dns_query, IP, Port, #dns_rec{
+proxy({dns_query, IP, Port,
+        #dns_rec{
             header = Header,
             qdlist = [#dns_query{
                     domain = Domain,
                     type = Type
                 }|_]
-        } = Rec}, #state{
+        } = Rec},
+    #state{
         dnsfd = DNSSocket,
         s = Socket,
         data = Data
@@ -204,11 +213,7 @@ proxy({dns_query, IP, Port, #dns_rec{
 
     error_logger:info_report([
             {direction, down},
-            {dns_query, Rec},
-            {data, Data},
-            {payload, Payload},
-            {response, Response},
-            {packet, Packet}
+            {dns_query, Rec}
         ]),
 
     ok = gen_udp:send(DNSSocket, IP, Port, Packet),