Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
re6stnet
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Milestones
Merge Requests
5
Merge Requests
5
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
re6stnet
Commits
6a665380
Commit
6a665380
authored
Jul 17, 2012
by
Ulysse Beaugnon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
private variables/functions in tunnelmanager are now named as private
parent
d19b9e2b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
22 deletions
+27
-22
TODO
TODO
+1
-0
tunnelmanager.py
tunnelmanager.py
+25
-21
vifibnet.py
vifibnet.py
+1
-1
No files found.
TODO
View file @
6a665380
...
...
@@ -3,6 +3,7 @@ Bugs :
To be done :
Do a clean-up in the import
Remove the parameters to choose the number of clients
To be discuss:
Remove the --no-boot option since we know when no node is avalaible
...
...
tunnelmanager.py
View file @
6a665380
...
...
@@ -9,46 +9,50 @@ free_interface_set = set(('client1', 'client2', 'client3', 'client4', 'client5',
class
TunnelManager
:
def
__init__
(
self
,
write_pipe
,
peers_db
):
self
.
write_pipe
=
write_pipe
self
.
peers_db
=
peers_db
self
.
connection_dict
=
{}
self
.
_write_pipe
=
write_pipe
self
.
_peers_db
=
peers_db
self
.
_connection_dict
=
{}
# TODO : choose this parameters automaticaly
self
.
_clientCount
=
15
self
.
_refreshCount
=
3
def
refresh
(
self
):
self
.
cleanDeads
()
self
.
removeSomeTunnels
()
self
.
makeNewTunnels
()
self
.
_
cleanDeads
()
self
.
_
removeSomeTunnels
()
self
.
_
makeNewTunnels
()
def
cleanDeads
(
self
):
for
id
in
self
.
connection_dict
.
keys
():
p
,
iface
=
self
.
connection_dict
[
id
]
def
_
cleanDeads
(
self
):
for
id
in
self
.
_
connection_dict
.
keys
():
p
,
iface
=
self
.
_
connection_dict
[
id
]
if
p
.
poll
()
!=
None
:
utils
.
log
(
'Connection with %s has failed with return code %s'
%
(
id
,
p
.
returncode
),
3
)
free_interface_set
.
add
(
iface
)
self
.
peers_db
.
unusePeer
(
id
)
del
self
.
connection_dict
[
id
]
self
.
_
peers_db
.
unusePeer
(
id
)
del
self
.
_
connection_dict
[
id
]
def
removeSomeTunnels
(
self
):
for
i
in
range
(
0
,
max
(
0
,
len
(
self
.
connection_dict
)
-
utils
.
config
.
client_count
+
utils
.
config
.
refresh_count
)):
peer_id
=
random
.
choice
(
self
.
connection_dict
.
keys
())
def
_
removeSomeTunnels
(
self
):
for
i
in
range
(
0
,
max
(
0
,
len
(
self
.
_connection_dict
)
-
self
.
_clientCount
+
self
.
_
refresh_count
)):
peer_id
=
random
.
choice
(
self
.
_
connection_dict
.
keys
())
kill
(
peer_id
)
def
kill
(
self
,
peer_id
):
def
_
kill
(
self
,
peer_id
):
utils
.
log
(
'Killing the connection with id '
+
str
(
peer_id
),
2
)
p
,
iface
=
self
.
connection_dict
.
pop
(
peer_id
)
p
,
iface
=
self
.
_
connection_dict
.
pop
(
peer_id
)
p
.
kill
()
free_interface_set
.
add
(
iface
)
self
.
peers_db
.
unusePeer
(
peer_id
)
self
.
_
peers_db
.
unusePeer
(
peer_id
)
def
makeNewTunnels
(
self
):
def
_
makeNewTunnels
(
self
):
try
:
for
peer_id
,
ip
,
port
,
proto
in
self
.
peers_db
.
getUnusedPeers
(
utils
.
config
.
client_count
-
len
(
self
.
connection_dict
),
self
.
write_pipe
):
for
peer_id
,
ip
,
port
,
proto
in
self
.
_peers_db
.
getUnusedPeers
(
self
.
_client_count
-
len
(
self
.
_connection_dict
),
self
.
_
write_pipe
):
utils
.
log
(
'Establishing a connection with id %s (%s:%s)'
%
(
peer_id
,
ip
,
port
),
2
)
iface
=
free_interface_set
.
pop
()
self
.
connection_dict
[
peer_id
]
=
(
openvpn
.
client
(
ip
,
write_pipe
,
'--dev'
,
iface
,
'--proto'
,
proto
,
'--rport'
,
str
(
port
),
self
.
_
connection_dict
[
peer_id
]
=
(
openvpn
.
client
(
ip
,
write_pipe
,
'--dev'
,
iface
,
'--proto'
,
proto
,
'--rport'
,
str
(
port
),
stdout
=
os
.
open
(
os
.
path
.
join
(
utils
.
config
.
log
,
'vifibnet.client.%s.log'
%
(
peer_id
,)),
os
.
O_WRONLY
|
os
.
O_CREAT
|
os
.
O_TRUNC
)
),
iface
)
self
.
peers_db
.
usePeer
(
peer_id
)
self
.
_
peers_db
.
usePeer
(
peer_id
)
except
KeyError
:
utils
.
log
(
"Can't establish connection with %s : no available interface"
%
ip
,
2
)
except
Exception
:
...
...
vifibnet.py
View file @
6a665380
...
...
@@ -51,7 +51,7 @@ def main():
if
ready
:
handle_message
(
read_pipe
.
readline
())
if
time
.
time
()
>=
next_refresh
:
peers_db
.
populate
(
10
)
peers_db
.
populate
(
10
0
)
tunnelManager
.
refresh
()
next_refresh
=
time
.
time
()
+
utils
.
config
.
refresh_time
except
KeyboardInterrupt
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment