diff options
author | xrs <xrs@mail36.net> | 2018-03-28 01:24:54 +0200 |
---|---|---|
committer | xrs <xrs@mail36.net> | 2018-03-28 01:24:54 +0200 |
commit | 0d24b1ba329faa35990034fcc861a264bb985fb1 (patch) | |
tree | 897d3d6321d3afb02a56e745f59d9a6a860e363e | |
parent | ec842752e6281ac9bc20adf5890e067ded485075 (diff) | |
parent | f307a9bd3d2bf5c60cf32b41c742d731c2133a20 (diff) | |
download | gnunet-0d24b1ba329faa35990034fcc861a264bb985fb1.tar.gz gnunet-0d24b1ba329faa35990034fcc861a264bb985fb1.zip |
Merge branch 'master' of ssh://gnunet.org/gnunet
-rw-r--r-- | doc/documentation/chapters/installation.texi | 4 | ||||
-rw-r--r-- | src/transport/gnunet-helper-transport-wlan.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/documentation/chapters/installation.texi b/doc/documentation/chapters/installation.texi index be2da8702..eeb14473b 100644 --- a/doc/documentation/chapters/installation.texi +++ b/doc/documentation/chapters/installation.texi | |||
@@ -19,6 +19,7 @@ it in the form of new chapters or insightful comments. | |||
19 | * Build instructions for Debian 7.5:: | 19 | * Build instructions for Debian 7.5:: |
20 | * Installing GNUnet from Git on Ubuntu 14.4:: | 20 | * Installing GNUnet from Git on Ubuntu 14.4:: |
21 | * Build instructions for Debian 8:: | 21 | * Build instructions for Debian 8:: |
22 | @c * Build instructions for OpenBSD 6.2:: | ||
22 | * Outdated build instructions for previous revisions:: | 23 | * Outdated build instructions for previous revisions:: |
23 | @c * Portable GNUnet:: | 24 | @c * Portable GNUnet:: |
24 | * The graphical configuration interface:: | 25 | * The graphical configuration interface:: |
@@ -1472,6 +1473,9 @@ with the default Sqlite database. Sqlite is usually fine for most | |||
1472 | applications, but MySQL can offer better performance and Postgres better | 1473 | applications, but MySQL can offer better performance and Postgres better |
1473 | resillience. | 1474 | resillience. |
1474 | 1475 | ||
1476 | @c @node Build instructions for OpenBSD 6.2 | ||
1477 | @c @section Build instructions for OpenBSD 6.2 | ||
1478 | |||
1475 | @node Outdated build instructions for previous revisions | 1479 | @node Outdated build instructions for previous revisions |
1476 | @section Outdated build instructions for previous revisions | 1480 | @section Outdated build instructions for previous revisions |
1477 | 1481 | ||
diff --git a/src/transport/gnunet-helper-transport-wlan.c b/src/transport/gnunet-helper-transport-wlan.c index cddff3790..0ce387013 100644 --- a/src/transport/gnunet-helper-transport-wlan.c +++ b/src/transport/gnunet-helper-transport-wlan.c | |||
@@ -2076,7 +2076,7 @@ main (int argc, char *argv[]) | |||
2076 | if (FD_ISSET (dev.fd_raw, &wfds)) | 2076 | if (FD_ISSET (dev.fd_raw, &wfds)) |
2077 | { | 2077 | { |
2078 | ssize_t ret = | 2078 | ssize_t ret = |
2079 | write (dev.fd_raw, write_pout.buf + write_std.pos, | 2079 | write (dev.fd_raw, write_pout.buf + write_pout.pos, |
2080 | write_pout.size - write_pout.pos); | 2080 | write_pout.size - write_pout.pos); |
2081 | if (0 > ret) | 2081 | if (0 > ret) |
2082 | { | 2082 | { |