Renamed s/http2_/h2_

joedevivo · Apr 28, 2016 · b4cb254 · b4cb254
1 parent 236ed94
commit b4cb254
Show file tree

Hide file tree

Showing 44 changed files with 522 additions and 550 deletions.
diff --git a/src/chatterbox_ranch_protocol.erl b/src/chatterbox_ranch_protocol.erl
@@ -18,7 +18,7 @@ start_link(Ref, Socket, Transport, Opts) ->
 init(Ref, Socket, T, Opts) ->
     ok = ranch:accept_ack(Ref),
     Http2Settings = proplists:get_value(http2_settings, Opts, chatterbox:settings(server)),
-    http2_connection:become({transport(T), Socket}, Http2Settings).
+    h2_connection:become({transport(T), Socket}, Http2Settings).
 
 transport(ranch_ssl) ->
     ssl;

diff --git a/src/chatterbox_static_content_handler.erl b/src/chatterbox_static_content_handler.erl
@@ -62,8 +62,8 @@ handle(ConnPid, StreamId, Headers, _ReqBody) ->
             ResponseHeaders = [
                                {<<":status">>,<<"403">>}
                               ],
-            http2_connection:send_headers(ConnPid, StreamId, ResponseHeaders),
-            http2_connection:send_body(ConnPid, StreamId, <<"No soup for you!">>),
+            h2_connection:send_headers(ConnPid, StreamId, ResponseHeaders),
+            h2_connection:send_body(ConnPid, StreamId, <<"No soup for you!">>),
             ok;
         {true, false} ->
             Ext = filename:extension(File),
@@ -83,10 +83,10 @@ handle(ConnPid, StreamId, Headers, _ReqBody) ->
                 {<<"content-type">>, MimeType}
             ],
 
-            http2_connection:send_headers(ConnPid, StreamId, ResponseHeaders),
+            h2_connection:send_headers(ConnPid, StreamId, ResponseHeaders),
 
 
-            case {MimeType, http2_connection:is_push(ConnPid)} of
+            case {MimeType, h2_connection:is_push(ConnPid)} of
                 {<<"text/html">>, true} ->
                     %% Search Data for resources to push
                     {ok, RE} = re:compile("<link rel=\"stylesheet\" href=\"([^\"]*)|<script src=\"([^\"]*)|src: '([^']*)"),
@@ -100,9 +100,10 @@ handle(ConnPid, StreamId, Headers, _ReqBody) ->
 
                     NewStreams =
                         lists:foldl(fun(R, Acc) ->
-                                            NewStreamId = http2_connection:new_stream(ConnPid),
-                                            PHeaders = generate_push_promise_headers(Headers, <<$/,R/binary>>),
-                                            http2_connection:send_promise(ConnPid, StreamId, NewStreamId, PHeaders),
+                                            NewStreamId = h2_connection:new_stream(ConnPid),
+                                            PHeaders = generate_push_promise_headers(Headers, <<$/,R/binary>>
+                                                                                                             ),
+                                            h2_connection:send_promise(ConnPid, StreamId, NewStreamId, PHeaders),
                                             [{NewStreamId, PHeaders}|Acc]
                                     end,
                                     [],
@@ -117,14 +118,14 @@ handle(ConnPid, StreamId, Headers, _ReqBody) ->
                 _ ->
                     ok
             end,
-            http2_connection:send_body(ConnPid, StreamId, Data),
+            h2_connection:send_body(ConnPid, StreamId, Data),
             ok;
         {false, false} ->
             ResponseHeaders = [
                                {<<":status">>,<<"404">>}
                               ],
-            http2_connection:send_headers(ConnPid, StreamId, ResponseHeaders),
-            http2_connection:send_body(ConnPid, StreamId, <<"No soup for you!">>),
+            h2_connection:send_headers(ConnPid, StreamId, ResponseHeaders),
+            h2_connection:send_body(ConnPid, StreamId, <<"No soup for you!">>),
             ok
     end,
     ok.

diff --git a/src/chatterbox_static_stream.erl b/src/chatterbox_static_stream.erl
@@ -2,7 +2,7 @@
 
 -include("http2.hrl").
 
--behaviour(http2_stream).
+-behaviour(h2_stream).
 
 -export([
          init/2,
@@ -99,7 +99,7 @@ on_request_end_stream(State=#cb_static{connection_pid=ConnPid,
                                    {<<"content-type">>, MimeType}
                                   ],
 
-                case {MimeType, http2_connection:is_push(ConnPid)} of
+                case {MimeType, h2_connection:is_push(ConnPid)} of
                     {<<"text/html">>, true} ->
                         %% Search Data for resources to push
                         {ok, RE} = re:compile("<link rel=\"stylesheet\" href=\"([^\"]*)|<script src=\"([^\"]*)|src: '([^']*)"),
@@ -113,9 +113,10 @@ on_request_end_stream(State=#cb_static{connection_pid=ConnPid,
                         NewStreams =
                             lists:foldl(
                               fun(R, Acc) ->
-                                      NewStreamId = http2_connection:new_stream(ConnPid),
-                                      PHeaders = generate_push_promise_headers(Headers, <<$/,R/binary>>),
-                                      http2_connection:send_promise(ConnPid, StreamId, NewStreamId, PHeaders),
+                                      NewStreamId = h2_connection:new_stream(ConnPid),
+                                      PHeaders = generate_push_promise_headers(Headers, <<$/,R/binary>>
+                                                                                                       ),
+                                      h2_connection:send_promise(ConnPid, StreamId, NewStreamId, PHeaders),
                                       [{NewStreamId, PHeaders}|Acc]
                               end,
                               [],
@@ -149,11 +150,11 @@ on_request_end_stream(State=#cb_static{connection_pid=ConnPid,
 
     case {Method, HeadersToSend, BodyToSend} of
         {<<"HEAD">>, _, _} ->
-                http2_connection:send_headers(ConnPid, StreamId, HeadersToSend, [{send_end_stream, true}]);
+                h2_connection:send_headers(ConnPid, StreamId, HeadersToSend, [{send_end_stream, true}]);
         %%{<<"GET">>, _, _} ->
         _ ->
-            http2_connection:send_headers(ConnPid, StreamId, HeadersToSend),
-            http2_connection:send_body(ConnPid, StreamId, BodyToSend)
+            h2_connection:send_headers(ConnPid, StreamId, HeadersToSend),
+            h2_connection:send_body(ConnPid, StreamId, BodyToSend)
     end,
 
     {ok, State}.

diff --git a/src/chatterbox_sup.erl b/src/chatterbox_sup.erl
@@ -35,8 +35,8 @@ init([]) ->
     {ok, ListenSocket} = gen_tcp:listen(Port, Options),
     Restart = {simple_one_for_one, 60, 3600},
     Children = [{socket,
-                {http2_connection, start_server_link, [{Transport, ListenSocket}, SSLOptions, Http2Settings]},
-                temporary, 1000, worker, [http2_socket]}],
+                {h2_connection, start_server_link, [{Transport, ListenSocket}, SSLOptions, Http2Settings]},
+                temporary, 1000, worker, [h2_connection]}],
     {ok, {Restart, Children}}.
 
 start_socket() ->

diff --git a/src/http2_client.erl → src/h2_client.erl b/src/http2_client.erl → src/h2_client.erl
@@ -1,5 +1,4 @@
--module(http2_client).
-
+-module(h2_client).
 -include("http2.hrl").
 
 %% Today's the day! We need to turn this gen_server into a gen_fsm
@@ -106,33 +105,33 @@ start_link(Transport, Host, Port, SSLOptions) ->
                http -> gen_tcp;
                https -> ssl
            end,
-    http2_connection:start_client_link(NewT, Host, Port, SSLOptions, chatterbox:settings(client)).
+    h2_connection:start_client_link(NewT, Host, Port, SSLOptions, chatterbox:settings(client)).
 
 start_ssl_upgrade_link(Host, Port, InitialMessage, SSLOptions) ->
-    http2_connection:start_ssl_upgrade_link(Host, Port, InitialMessage, SSLOptions, chatterbox:settings(client)).
+    h2_connection:start_ssl_upgrade_link(Host, Port, InitialMessage, SSLOptions, chatterbox:settings(client)).
 
 -spec stop(pid()) -> ok.
 stop(Pid) ->
-    http2_connection:stop(Pid).
+    h2_connection:stop(Pid).
 
 sync_request(CliPid, Headers, Body) ->
-    StreamId = http2_connection:new_stream(CliPid),
-    http2_connection:send_headers(CliPid, StreamId, Headers),
-    http2_connection:send_body(CliPid,StreamId,Body),
+    StreamId = h2_connection:new_stream(CliPid),
+    h2_connection:send_headers(CliPid, StreamId, Headers),
+    h2_connection:send_body(CliPid,StreamId,Body),
     receive
         {'END_STREAM', StreamId} ->
-            http2_connection:get_response(CliPid, StreamId)
+            h2_connection:get_response(CliPid, StreamId)
     after 5000 ->
         {error, timeout}
     end.
 send_request(CliPid, Headers, Body) ->
-    StreamId = http2_connection:new_stream(CliPid),
-    http2_connection:send_headers(CliPid, StreamId, Headers),
-    http2_connection:send_body(CliPid,StreamId,Body),
+    StreamId = h2_connection:new_stream(CliPid),
+    h2_connection:send_headers(CliPid, StreamId, Headers),
+    h2_connection:send_body(CliPid,StreamId,Body),
     {ok, StreamId}.
 
 -spec get_response(pid(), stream_id()) ->
                           {ok, {hpack:header(), iodata()}}
                            | {error, term()}.
 get_response(CliPid, StreamId) ->
-    http2_connection:get_response(CliPid, StreamId).
+    h2_connection:get_response(CliPid, StreamId).