mcqueryHEADmaster

1 files changed, 6 insertions, 6 deletions

diff --git a/mcnetwork.c b/mcnetwork.c
index 00cdf6c..2d350c8 100644
--- a/mcnetwork.c
+++ b/mcnetwork.c
@@ -9,7 +9,7 @@
 
 #include "mctypes.h"
 
-void send_handshake(int socket, int protocol, char* address,
+void send_ping_handshake(int socket, int protocol, char* address,
     unsigned short port, int next_state)
 {
     void* raw_handshake;
@@ -17,16 +17,16 @@ void send_handshake(int socket, int protocol, char* address,
     handshake hs = { to_varint(protocol),
         { to_varint(strlen(address)), address }, port, to_varint(next_state) };
     handshake_size = serialize_handshake(hs, &raw_handshake);
-    send_packet(socket, 0x0, handshake_size, raw_handshake);
+    send_ping_packet(socket, 0x0, handshake_size, raw_handshake);
     free_handshake(hs);
 }
 
-void send_packet(int socket, int packet_id, size_t raw_size, void* raw_data)
+void send_ping_packet(int socket, int packet_id, size_t raw_size, void* payload)
 {
     void* raw_packet;
     size_t p_size;
     packet p = { to_varint(raw_size + size_varint(to_varint(packet_id))),
-        to_varint(packet_id), raw_data };
+        to_varint(packet_id), payload };
     p_size = serialize_packet(p, &raw_packet);
     free_packet(p);
 
@@ -34,7 +34,7 @@ void send_packet(int socket, int packet_id, size_t raw_size, void* raw_data)
         perror("packet failed");
 }
 
-void connect_mc_server_ping(int socket, char* address, unsigned short port)
+void connect_mc_server(int socket, char* address, unsigned short port, int protocol)
 {
     struct addrinfo* mc_info = malloc(sizeof(struct addrinfo));
     memset(mc_info, 0, sizeof(struct addrinfo));
@@ -42,7 +42,7 @@ void connect_mc_server_ping(int socket, char* address, unsigned short port)
     memset(&hints, 0, sizeof(struct addrinfo));
     hints.ai_family = AF_INET;
     hints.ai_socktype = SOCK_STREAM;
-    hints.ai_protocol = IPPROTO_TCP;
+    hints.ai_protocol = protocol;
 
     if (getaddrinfo(address, "80", &hints, &mc_info) != 0)
 		exit(1);