Commit 1416f54d authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Split dir_connection_t into its own header

parent 3b917b24

src/or/circuitlist.c

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#include "control.h"

#include "crypto_rand.h"

#include "crypto_util.h"

#include "directory.h"

#include "entrynodes.h"

#include "main.h"

#include "hs_circuit.h"
@@ -91,6 +92,7 @@ 


#include "ht.h"



#include "dir_connection_st.h"

#include "edge_connection_st.h"



/********* START VARIABLES **********/

src/or/circuituse.c

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include "connection.h"

#include "connection_edge.h"

#include "control.h"

#include "directory.h"

#include "entrynodes.h"

#include "hs_common.h"

#include "hs_client.h"
@@ -56,6 +57,7 @@ 
#include "router.h"

#include "routerlist.h"



#include "dir_connection_st.h"

#include "entry_connection_st.h"



static void circuit_expire_old_circuits_clientside(void);

src/or/connection.c

+8 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ 
#include <sys/un.h>

#endif



#include "dir_connection_st.h"

#include "control_connection_st.h"

#include "entry_connection_st.h"

#include "port_cfg_st.h"
@@ -4112,6 +4113,13 @@ connection_write_to_buf_impl_,(const char *string, size_t len, 
  connection_write_to_buf_commit(conn, written);

}



void

connection_buf_add_compress(const char *string, size_t len,

                            dir_connection_t *conn, int done)

{

  connection_write_to_buf_impl_(string, len, TO_CONN(conn), done ? -1 : 1);

}



/**

 * Add all bytes from <b>buf</b> to <b>conn</b>'s outbuf, draining them

 * from <b>buf</b>. (If the connection is marked and will soon be closed,

src/or/connection.h

+2 −9
Original line number Diff line number Diff line
@@ -150,20 +150,13 @@ MOCK_DECL(void, connection_write_to_buf_impl_, 
/* DOCDOC connection_write_to_buf */

static void connection_buf_add(const char *string, size_t len,

                                    connection_t *conn);

/* DOCDOC connection_write_to_buf_compress */

static void connection_buf_add_compress(const char *string, size_t len,

                                             dir_connection_t *conn, int done);

static inline void

connection_buf_add(const char *string, size_t len, connection_t *conn)

{

  connection_write_to_buf_impl_(string, len, conn, 0);

}

static inline void

connection_buf_add_compress(const char *string, size_t len,

                                 dir_connection_t *conn, int done)

{

  connection_write_to_buf_impl_(string, len, TO_CONN(conn), done ? -1 : 1);

}

void connection_buf_add_compress(const char *string, size_t len,

                                 dir_connection_t *conn, int done);

void connection_buf_add_buf(connection_t *conn, buf_t *buf);



/* DOCDOC connection_get_inbuf_len */

src/or/connection_edge.c

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 
#include "routerset.h"

#include "circuitbuild.h"



#include "dir_connection_st.h"

#include "entry_connection_st.h"



#ifdef HAVE_LINUX_TYPES_H