[pisa-src] r1804 - in trunk/pairing: common.h create_send_headers.c packet_handler_send.h send.c send.h
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Thu, 26 Nov 2009 14:45:56 +0100
Author: biurrun
Date: Thu Nov 26 14:45:56 2009
New Revision: 1804
Log:
Move struct and variable declarations from send.h to common.h.
Remove the now pointless send.h.
Deleted:
trunk/pairing/send.h
Modified:
trunk/pairing/common.h
trunk/pairing/create_send_headers.c
trunk/pairing/packet_handler_send.h
trunk/pairing/send.c
Modified: trunk/pairing/common.h
==============================================================================
--- trunk/pairing/common.h Thu Nov 26 14:42:50 2009 (r1803)
+++ trunk/pairing/common.h Thu Nov 26 14:45:56 2009 (r1804)
@@ -39,12 +39,19 @@
int socket_desc;
};
+struct global_send_variables {
+ int socket_desc;
+ int nickname_given;
+ int force_options;
+};
+
// Global variables
/*extern int socket_desc;
extern int force_options;
extern int nickname_given;*/
extern struct global_accept_variables global_accept;
+extern struct global_send_variables global_send;
// Constants
#define LENGTH_PASSWORD 50
Modified: trunk/pairing/create_send_headers.c
==============================================================================
--- trunk/pairing/create_send_headers.c Thu Nov 26 14:42:50 2009 (r1803)
+++ trunk/pairing/create_send_headers.c Thu Nov 26 14:45:56 2009 (r1804)
@@ -15,8 +15,6 @@
#include <string.h>
#include "common.h"
#include "common_headers.h"
-#include "send.h"
-
#include "create_send_headers.h"
Modified: trunk/pairing/packet_handler_send.h
==============================================================================
--- trunk/pairing/packet_handler_send.h Thu Nov 26 14:42:50 2009 (r1803)
+++ trunk/pairing/packet_handler_send.h Thu Nov 26 14:45:56 2009 (r1804)
@@ -17,7 +17,6 @@
#include "common_headers.h"
#include "hash.h"
#include "libconfig_wrapper.h"
-#include "send.h"
#include "create_send_headers.h"
#define FILE_KNOWN_RELAYS "known_relays.cfg"
Modified: trunk/pairing/send.c
==============================================================================
--- trunk/pairing/send.c Thu Nov 26 14:42:50 2009 (r1803)
+++ trunk/pairing/send.c Thu Nov 26 14:45:56 2009 (r1804)
@@ -24,7 +24,6 @@
#include "packet_handler.h"
#include "libconfig_wrapper.h"
#include "create_send_headers.h"
-#include "send.h"
// When these are updated, the user message in parse_options() should also be
updated
#define REQUEST_CONNECT 0
Other related posts:
- » [pisa-src] r1804 - in trunk/pairing: common.h create_send_headers.c packet_handler_send.h send.c send.h - Diego Biurrun
