Commit 85e50954 authored by teor's avatar teor
Browse files

relay: Make a transport_config function private 

Part of 32213.
parent fd18d512

src/feature/relay/transport_config.c

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 **/



#include "orconfig.h"

#define RELAY_TRANSPORT_CONFIG_PRIVATE

#include "feature/relay/transport_config.h"



#include "lib/encoding/confline.h"
@@ -111,7 +112,7 @@ get_transport_bindaddr_from_config(const char *transport) 
 *

 *  The returned smartlist and its strings are allocated on the heap

 *  and it's the responsibility of the caller to free it. */

smartlist_t *

STATIC smartlist_t *

get_options_from_transport_options_line(const char *line,const char *transport)

{

  smartlist_t *items = smartlist_new();

src/feature/relay/transport_config.h

+10 −2
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ 
#ifndef TOR_FEATURE_RELAY_TRANSPORT_CONFIG_H

#define TOR_FEATURE_RELAY_TRANSPORT_CONFIG_H



#include "lib/testsupport/testsupport.h"



typedef struct or_options_t or_options_t;

typedef struct smartlist_t smartlist_t;



char *get_transport_bindaddr_from_config(const char *transport);

smartlist_t *get_options_from_transport_options_line(const char *line,

                                                     const char *transport);

smartlist_t *get_options_for_server_transport(const char *transport);



int options_validate_server_transport(const or_options_t *old_options,
@@ -26,4 +26,12 @@ int options_validate_server_transport(const or_options_t *old_options, 


int options_act_server_transport(const or_options_t *old_options);



#ifdef RELAY_TRANSPORT_CONFIG_PRIVATE



STATIC smartlist_t *get_options_from_transport_options_line(

                      const char *line,

                      const char *transport);



#endif



#endif /* !defined(TOR_FEATURE_RELAY_TRANSPORT_CONFIG_H) */

src/test/test_config.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#define CONFIG_PRIVATE

#define RELAY_CONFIG_PRIVATE

#define RELAY_TRANSPORT_CONFIG_PRIVATE

#define PT_PRIVATE

#define ROUTERSET_PRIVATE

#include "core/or/or.h"