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
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
Joanne Hugé
re6stnet
Commits
33822341
Commit
33822341
authored
Jul 17, 2012
by
Guillaume Bury
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated TODO + renamed babel -> router
parent
31222fbe
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
TODO
TODO
+8
-6
plib.py
plib.py
+1
-1
vifibnet.py
vifibnet.py
+1
-1
No files found.
TODO
View file @
33822341
Bugs :
Bugs :
When no peer is avalaible without the --no-boot option, it crash
When no peer is avalaible without the --no-boot option, it crash
=> see below
To be done :
To be done :
Replace comments at the beginning of functions with docstrings
Replace comments at the beginning of functions with docstrings
& give all fn docstrings
Do a clean-up in the import
Do a clean-up in the import
Remove the parameters to choose the number of clients
Remove the parameters to choose the number of clients
To be discuss:
To be discuss:
Remove the --no-boot option since we know when no node is avalaible
Remove the --no-boot option since we know when no node is avalaible
\=> the no-boot option is only useful when the server knows no peer,
irl it should never happen, no-boot is a debug option
The organisation of the code
The organisation of the code
vifibnet.py Just contain the main loop and the init
vifibnet.py Just contain the main loop and the init
openpvn.py To launch openvpn
processes
plib.py To launch server/client/routing
processes
utils.py Small functions to do some usefull job
, also contains the config
utils.py Small functions to do some usefull job
db.py Function to
access the DB (merge with utils ?)
db.py Function to
manage peers
tunnelmanager.py To choose wich connection delete/keep/...
tunnelmanager.py To choose wich connection delete/keep/...
upnpigd.py To open a port and find the external IP
upnpigd.py To open a port and find the external IP
...
...
plib.py
View file @
33822341
...
@@ -48,7 +48,7 @@ def client(serverIp, pipe_fd, *args, **kw):
...
@@ -48,7 +48,7 @@ def client(serverIp, pipe_fd, *args, **kw):
'--route-up'
,
'ovpn-client '
+
str
(
pipe_fd
),
'--route-up'
,
'ovpn-client '
+
str
(
pipe_fd
),
*
args
,
**
kw
)
*
args
,
**
kw
)
def
babel
(
network
,
internal_ip
,
interface_list
,
**
kw
):
def
router
(
network
,
internal_ip
,
interface_list
,
**
kw
):
utils
.
log
(
'Starting babel'
,
3
)
utils
.
log
(
'Starting babel'
,
3
)
args
=
[
'babeld'
,
args
=
[
'babeld'
,
'-C'
,
'redistribute local ip %s'
%
(
internal_ip
),
'-C'
,
'redistribute local ip %s'
%
(
internal_ip
),
...
...
vifibnet.py
View file @
33822341
...
@@ -63,7 +63,7 @@ def main():
...
@@ -63,7 +63,7 @@ def main():
# Launch babel on all interfaces. WARNING : you have to be root to start babeld
# Launch babel on all interfaces. WARNING : you have to be root to start babeld
interface_list
=
[
'vifibnet'
]
+
list
(
tunnel_manager
.
free_interface_set
)
interface_list
=
[
'vifibnet'
]
+
list
(
tunnel_manager
.
free_interface_set
)
babel
=
plib
.
babel
(
network
,
internal_ip
,
interface_list
,
router
=
plib
.
router
(
network
,
internal_ip
,
interface_list
,
stdout
=
os
.
open
(
os
.
path
.
join
(
config
.
log
,
'vifibnet.babeld.log'
),
stdout
=
os
.
open
(
os
.
path
.
join
(
config
.
log
,
'vifibnet.babeld.log'
),
os
.
O_WRONLY
|
os
.
O_CREAT
|
os
.
O_TRUNC
),
stderr
=
subprocess
.
STDOUT
)
os
.
O_WRONLY
|
os
.
O_CREAT
|
os
.
O_TRUNC
),
stderr
=
subprocess
.
STDOUT
)
...
...
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