Simplify encode_message.

mirage · Feb 16, 2017 · 67e10f4 · 67e10f4
1 parent ebe846b
commit 67e10f4
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/lib/buf.ml b/lib/buf.ml
@@ -128,33 +128,33 @@ let encode_kex_pkt kex =
   to_cstruct
 
 let encode_message msg =
-  let add_id id buf = add_uint8 (message_id_to_int id) buf in
+  let add_id id = add_uint8 (message_id_to_int id) (create ()) in
   let buf = match msg with
     | Ssh_msg_disconnect (code, desc, lang) ->
-      add_id SSH_MSG_DISCONNECT (create ()) |>
+      add_id SSH_MSG_DISCONNECT |>
       add_uint32 code |>
       add_string desc |>
       add_string lang
     | Ssh_msg_ignore s ->
-      add_id SSH_MSG_IGNORE (create ()) |>
+      add_id SSH_MSG_IGNORE |>
       add_string s
     | Ssh_msg_unimplemented x ->
-      add_id SSH_MSG_UNIMPLEMENTED (create ()) |>
+      add_id SSH_MSG_UNIMPLEMENTED |>
       add_uint32 x
     | Ssh_msg_debug (always_display, message, lang) ->
-      add_id SSH_MSG_DEBUG (create ()) |>
+      add_id SSH_MSG_DEBUG |>
       add_bool always_display |>
       add_string message |>
       add_string lang
     | Ssh_msg_service_request s ->
-      add_id SSH_MSG_SERVICE_REQUEST (create ()) |>
+      add_id SSH_MSG_SERVICE_REQUEST |>
       add_string s
     | Ssh_msg_service_accept s ->
-      add_id SSH_MSG_SERVICE_ACCEPT (create ()) |>
+      add_id SSH_MSG_SERVICE_ACCEPT |>
       add_string s
     (* | Ssh_msg_kexinit kex -> encode_kex_pkt kex (\* XXX convert *\) *)
     | Ssh_msg_newkeys ->
-      add_id SSH_MSG_NEWKEYS (create ())
+      add_id SSH_MSG_NEWKEYS
     (* | SSH_MSG_KEXDH_INIT -> decode_mpint buf >>= fun (e, buf) -> *)
     (*   ok (Ssh_msg_kexdh_init e) *)
     (* | SSH_MSG_KEXDH_REPLY -> *)
@@ -165,25 +165,25 @@ let encode_message msg =
     (* | Ssh_msg_userauth_request user service publickey *)
     (*   -> unimplemented () *)
     | Ssh_msg_userauth_failure (nl, psucc) ->
-      add_id SSH_MSG_USERAUTH_FAILURE (create ()) |>
+      add_id SSH_MSG_USERAUTH_FAILURE |>
       add_nl nl |>
       add_bool psucc
     | Ssh_msg_userauth_success ->
-      add_id SSH_MSG_USERAUTH_SUCCESS (create ())
+      add_id SSH_MSG_USERAUTH_SUCCESS
     | Ssh_msg_userauth_banner (message, lang) ->
-      add_id SSH_MSG_USERAUTH_BANNER (create ()) |>
+      add_id SSH_MSG_USERAUTH_BANNER |>
       add_string message |>
       add_string lang
     (* | SSH_MSG_GLOBAL_REQUEST -> unimplemented () *)
     (* | SSH_MSG_REQUEST_SUCCESS -> unimplemented () *)
     | Ssh_msg_request_failure ->
-      add_id SSH_MSG_REQUEST_FAILURE (create ())
+      add_id SSH_MSG_REQUEST_FAILURE
     (* | SSH_MSG_CHANNEL_OPEN -> unimplemented () *)
     (* | SSH_MSG_CHANNEL_OPEN_CONFIRMATION -> unimplemented () *)
     | Ssh_msg_channel_open_failure ->
-      add_id SSH_MSG_CHANNEL_OPEN_FAILURE (create ())
+      add_id SSH_MSG_CHANNEL_OPEN_FAILURE
     | Ssh_msg_channel_window_adjust (channel, n) ->
-      add_id SSH_MSG_CHANNEL_WINDOW_ADJUST (create ()) |>
+      add_id SSH_MSG_CHANNEL_WINDOW_ADJUST |>
       add_uint32 channel |>
       add_uint32 n
     (* | SSH_MSG_CHANNEL_DATA -> unimplemented () *)
@@ -193,7 +193,7 @@ let encode_message msg =
     (* | SSH_MSG_CHANNEL_REQUEST -> unimplemented () *)
     (* | SSH_MSG_CHANNEL_SUCCESS -> unimplemented () *)
     | Ssh_msg_channel_failure channel ->
-      add_id SSH_MSG_CHANNEL_FAILURE (create ()) |>
+      add_id SSH_MSG_CHANNEL_FAILURE |>
       add_uint32 channel
     | _ -> failwith "removeme"
   in