PeerChatSender: rename to PeerChat

client/CMakeLists.txt

@@ -12,7 +12,7 @@ add_executable(badvpn-client
     SPProtoEncoder.c
     SPProtoDecoder.c
     DataProtoKeepaliveSource.c
-    PeerChatSender.c
+    PeerChat.c
     SCOutmsgEncoder.c
 )
 target_link_libraries(badvpn-client system flow flowextra tuntap server_conection security ${NSPR_LIBRARIES} ${NSS_LIBRARIES})

client/PeerChatSender.c → client/PeerChat.c

@@ -1,5 +1,5 @@
 /**
- * @file PeerChatSender.c
+ * @file PeerChat.c
  * @author Ambroz Bizjak <ambrop7@gmail.com>
  * 
  * @section LICENSE
@@ -24,9 +24,9 @@
 
 #include <misc/byteorder.h>
 
-#include "PeerChatSender.h"
+#include "PeerChat.h"
 
-int PeerChatSender_Init (PeerChatSender *o, peerid_t peer_id, PacketPassInterface *output, BPendingGroup *pg, void *user, PeerChatSender_handler_error handler_error)
+int PeerChat_Init (PeerChat *o, peerid_t peer_id, PacketPassInterface *output, BPendingGroup *pg, void *user, PeerChat_handler_error handler_error)
 {
     ASSERT(PacketPassInterface_GetMTU(output) >= sizeof(struct packetproto_header) + SC_MAX_ENC)
     
@@ -58,7 +58,7 @@ fail1:
     return 0;
 }
 
-void PeerChatSender_Free (PeerChatSender *o)
+void PeerChat_Free (PeerChat *o)
 {
     DebugObject_Free(&o->d_obj);
     
@@ -75,7 +75,7 @@ void PeerChatSender_Free (PeerChatSender *o)
     PacketCopier_Free(&o->copier);
 }
 
-PacketPassInterface * PeerChatSender_GetInput (PeerChatSender *o)
+PacketPassInterface * PeerChat_GetInput (PeerChat *o)
 {
     DebugObject_Access(&o->d_obj);
     

client/PeerChatSender.h → client/PeerChat.h

@@ -1,5 +1,5 @@
 /**
- * @file PeerChatSender.h
+ * @file PeerChat.h
  * @author Ambroz Bizjak <ambrop7@gmail.com>
  * 
  * @section LICENSE
@@ -20,8 +20,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef BADVPN_PEERCHATSENDER_H
-#define BADVPN_PEERCHATSENDER_H
+#ifndef BADVPN_PEERCHAT_H
+#define BADVPN_PEERCHAT_H
 
 #include <protocol/packetproto.h>
 #include <protocol/scproto.h>
@@ -33,20 +33,20 @@
 #include <flow/PacketCopier.h>
 #include <client/SCOutmsgEncoder.h>
 
-typedef void (*PeerChatSender_handler_error) (void *user);
+typedef void (*PeerChat_handler_error) (void *user);
 
 typedef struct {
     void *user;
-    PeerChatSender_handler_error handler_error;
+    PeerChat_handler_error handler_error;
     SinglePacketBuffer buffer;
     PacketProtoEncoder pp_encoder;
     SCOutmsgEncoder sc_encoder;
     PacketCopier copier;
     DebugObject d_obj;
-} PeerChatSender;
+} PeerChat;
 
-int PeerChatSender_Init (PeerChatSender *o, peerid_t peer_id, PacketPassInterface *output, BPendingGroup *pg, void *user, PeerChatSender_handler_error handler_error) WARN_UNUSED;
-void PeerChatSender_Free (PeerChatSender *o);
-PacketPassInterface * PeerChatSender_GetInput (PeerChatSender *o);
+int PeerChat_Init (PeerChat *o, peerid_t peer_id, PacketPassInterface *output, BPendingGroup *pg, void *user, PeerChat_handler_error handler_error) WARN_UNUSED;
+void PeerChat_Free (PeerChat *o);
+PacketPassInterface * PeerChat_GetInput (PeerChat *o);
 
 #endif

client/client.c

@@ -2690,8 +2690,8 @@ struct server_flow * server_flow_init (peerid_t peer_id)
     PacketPassFairQueueFlow_Init(&flow->qflow, &server_queue);
     
     // init sender
-    if (!PeerChatSender_Init(&flow->sender, peer_id, PacketPassFairQueueFlow_GetInput(&flow->qflow), BReactor_PendingGroup(&ss), NULL, NULL)) {
-        BLog(BLOG_ERROR, "PeerChatSender_Init failed");
+    if (!PeerChat_Init(&flow->sender, peer_id, PacketPassFairQueueFlow_GetInput(&flow->qflow), BReactor_PendingGroup(&ss), NULL, NULL)) {
+        BLog(BLOG_ERROR, "PeerChat_Init failed");
         goto fail1;
     }
     
@@ -2699,7 +2699,7 @@ struct server_flow * server_flow_init (peerid_t peer_id)
     BufferWriter_Init(&flow->writer, SC_MAX_MSGLEN, BReactor_PendingGroup(&ss));
     
     // init buffer
-    if (!PacketBuffer_Init(&flow->buffer, BufferWriter_GetOutput(&flow->writer), PeerChatSender_GetInput(&flow->sender), SERVER_BUFFER_MIN_PACKETS, BReactor_PendingGroup(&ss))) {
+    if (!PacketBuffer_Init(&flow->buffer, BufferWriter_GetOutput(&flow->writer), PeerChat_GetInput(&flow->sender), SERVER_BUFFER_MIN_PACKETS, BReactor_PendingGroup(&ss))) {
         BLog(BLOG_ERROR, "PacketBuffer_Init failed");
         goto fail2;
     }
@@ -2711,7 +2711,7 @@ struct server_flow * server_flow_init (peerid_t peer_id)
     
 fail2:
     BufferWriter_Free(&flow->writer);
-    PeerChatSender_Free(&flow->sender);
+    PeerChat_Free(&flow->sender);
 fail1:
     PacketPassFairQueueFlow_Free(&flow->qflow);
     free(flow);
@@ -2735,7 +2735,7 @@ void server_flow_free (struct server_flow *flow)
     BufferWriter_Free(&flow->writer);
     
     // free sender
-    PeerChatSender_Free(&flow->sender);
+    PeerChat_Free(&flow->sender);
     
     // free queue flow
     PacketPassFairQueueFlow_Free(&flow->qflow);

client/client.h

@@ -33,7 +33,7 @@
 #include <client/DataProto.h>
 #include <client/DPReceive.h>
 #include <client/FrameDecider.h>
-#include <client/PeerChatSender.h>
+#include <client/PeerChat.h>
 
 // NOTE: all time values are in milliseconds
 
@@ -87,7 +87,7 @@
 
 struct server_flow {
     PacketPassFairQueueFlow qflow;
-    PeerChatSender sender;
+    PeerChat sender;
     PacketBuffer buffer;
     BufferWriter writer;
     int msg_len;