Reorganise so we have wrapper, unwraper and hide-eid.
unwrapper and hide-eid don't work yet, of course.
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
#include "util.h"
|
||||
#include "rlocs.h"
|
||||
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
@@ -79,4 +80,64 @@ int link_set_up( char *link_name, int state )
|
||||
|
||||
return 1;
|
||||
|
||||
}
|
||||
|
||||
|
||||
int session_setup( struct session *session, char *config_file, char *listen_if, char *output_if )
|
||||
{
|
||||
memset( &session, 0, sizeof( struct session ) );
|
||||
session->listen_if = -1;
|
||||
session->output_if = -1;
|
||||
|
||||
session->rlocs = rlocs_new( config_file );
|
||||
|
||||
if ( session->rlocs == NULL ) {
|
||||
warn( "Failed to get config from %s", config_file );
|
||||
return 0;
|
||||
}
|
||||
|
||||
rlocs_debug_output( session->rlocs );
|
||||
|
||||
// TODO: We can scale the tun architecture by using multiqueue and having
|
||||
// a bunch of workers, rather than this noddy scheme. If we don't jump
|
||||
// directly to something saner, anyway...
|
||||
|
||||
session->listen_if = create_tun( listen_if );
|
||||
if ( session->listen_if == -1 ) {
|
||||
warn( "Error opening %s for listening", listen_if );
|
||||
rlocs_free( session->rlocs );
|
||||
return 0;
|
||||
}
|
||||
link_set_up( listen_if, 1 );
|
||||
|
||||
|
||||
if ( strcmp( listen_if, output_if ) == 0 ) {
|
||||
session->same_if = 1;
|
||||
session->output_if = session->listen_if;
|
||||
} else {
|
||||
session->same_if = 0;
|
||||
session->output_if = create_tun( output_if );
|
||||
|
||||
if ( session->output_if == -1 ) {
|
||||
warn( "Error opening %s for outputting", output_if );
|
||||
rlocs_free( session->rlocs );
|
||||
close( session->listen_if );
|
||||
return 0;
|
||||
}
|
||||
link_set_up( output_if, 1 );
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
void session_teardown( struct session *session )
|
||||
{
|
||||
rlocs_free( session->rlocs );
|
||||
if ( session->listen_if >= 0 ) {
|
||||
close( session->listen_if );
|
||||
}
|
||||
|
||||
if ( session->output_if >= 0 && !session->same_if ) {
|
||||
close( session->output_if );
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user