Skip to content

A couple of bandwidth_upload-related fixes #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stapelberg wants to merge 4 commits into
base: master
Choose a base branch
from
Open

A couple of bandwidth_upload-related fixes #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cc1613
Bugfix: actually expose bandwidth in JSON status
stapelberg Jul 27, 2016
181923e
example config: document bandwidth_upload
stapelberg Jul 27, 2016
b6a424f
mlvpn.conf.5: clarify/expand bandwidth_upload
stapelberg Jul 27, 2016
195b13a
non equivalent links: mention bandwidth_upload
stapelberg Jul 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/examples/mlvpn.conf.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ bindport = 5080
#bindfib = 0
#remotehost = "10.2.3.4"
#remoteport = 5080
## Bandwidth of this link, in bytes/s. If not specified, each link will only
## receive as much traffic as the slowest link can handle.
#bandwidth_upload = 61440
#timeout = 25

Expand Down
4 changes: 4 additions & 0 deletions doc/source/what_is_mlvpn.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ Limitations

Non equivalent links (3G/4G and *DSL or WIFI and *DSL)
======================================================

Note: make sure you set the bandwidth_upload on each link, otherwise each link
will only receive as much traffic as the slowest link can handle.

mlvpn can aggregate very different links if reordering is enabled.

If you have a high latency 3G/4G link and a DSL connection, then
Expand Down
6 changes: 5 additions & 1 deletion man/mlvpn.conf.5.ronn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,11 @@ The section name is mapped to the tunnel name. Example: "[adsl1]", "[adsl2]".
Bandwidth is specified in Bytes (1 KiB is 1024 Bytes).

This is used to setup the weighted round-robin balancing algorithm.
Set 0 if both links are similar. (client/server)

If not specified, each link will only receive as much traffic as the
slowest link can handle.

Set to 0 if both links have the same bandwidth. (client/server)

- _timeout_ = 25
Override **[general]** timeout for this link. (client/server)
Expand Down
2 changes: 1 addition & 1 deletion src/control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ void mlvpn_control_write_status(struct mlvpn_control *ctrl)
t->recvpackets,
t->sentbytes,
t->recvbytes,
0,
t->bandwidth,
(uint32_t)t->srtt,
mlvpn_loss_ratio(t),
t->disconnects,
Expand Down