diff options
author | Nils Gillmann <ng0@n0.is> | 2018-05-14 07:11:13 +0000 |
---|---|---|
committer | Nils Gillmann <ng0@n0.is> | 2018-05-14 07:11:13 +0000 |
commit | 7e1a12e25b39cbd78569547054f576c1bce478b2 (patch) | |
tree | 050410119b7a70d5615e3f33db81f65b94a22030 /doc | |
parent | f1c528c2196d1bf1cc3a662a157ee0a0ffc15fbb (diff) | |
parent | 3eca7d41eafd7d2f3bf000c6df221e913fe6ff23 (diff) | |
download | gnunet-7e1a12e25b39cbd78569547054f576c1bce478b2.tar.gz gnunet-7e1a12e25b39cbd78569547054f576c1bce478b2.zip |
Merge branch 'master' of gnunet.org:gnunet
Diffstat (limited to 'doc')
-rw-r--r-- | doc/documentation/tutorial-examples/005.c | 5 | ||||
-rw-r--r-- | doc/man/gnunet-zoneimport.1 | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/doc/documentation/tutorial-examples/005.c b/doc/documentation/tutorial-examples/005.c index 0c459f509..1b59f85a6 100644 --- a/doc/documentation/tutorial-examples/005.c +++ b/doc/documentation/tutorial-examples/005.c | |||
@@ -2,7 +2,8 @@ struct GNUNET_MQ_Envelope *env; | |||
2 | struct GNUNET_MessageHeader *msg; | 2 | struct GNUNET_MessageHeader *msg; |
3 | 3 | ||
4 | env = GNUNET_MQ_msg_extra (msg, payload_size, GNUNET_MY_MESSAGE_TYPE); | 4 | env = GNUNET_MQ_msg_extra (msg, payload_size, GNUNET_MY_MESSAGE_TYPE); |
5 | memcpy (&msg[1], &payload, payload_size); | 5 | GNUNET_memcpy (&msg[1], |
6 | &payload, | ||
7 | payload_size); | ||
6 | // Send message via message queue 'mq' | 8 | // Send message via message queue 'mq' |
7 | GNUNET_mq_send (mq, env); | 9 | GNUNET_mq_send (mq, env); |
8 | |||
diff --git a/doc/man/gnunet-zoneimport.1 b/doc/man/gnunet-zoneimport.1 index bcfa7b734..cf76b86ee 100644 --- a/doc/man/gnunet-zoneimport.1 +++ b/doc/man/gnunet-zoneimport.1 | |||
@@ -48,6 +48,14 @@ Use the configuration file FILENAME. | |||
48 | .IP "\-h, \-\-help" | 48 | .IP "\-h, \-\-help" |
49 | Print short help on options. | 49 | Print short help on options. |
50 | .B | 50 | .B |
51 | .IP "\-m RELATIVETIME, \-\-minimum-expiration=RELATIVETIME" | ||
52 | .B | ||
53 | Ensure that imported DNS records never have an expiration time that | ||
54 | is less than RELATIVETIME into the future. RELATIVETIME is a time | ||
55 | given like "1 week" or "1 h". If DNS returns records with a shorter | ||
56 | lifetime, gnunet\-zoneimport will simply bump the lifetime to the | ||
57 | specified value (relative to the time of the import). Default is zero. | ||
58 | |||
51 | .IP "\-s MAPSIZE, \-\-size=MAPSIZE" | 59 | .IP "\-s MAPSIZE, \-\-size=MAPSIZE" |
52 | Specifies the size (in number of entries) to use for the main hash | 60 | Specifies the size (in number of entries) to use for the main hash |
53 | map. The value provided should be at least twice the number of domain | 61 | map. The value provided should be at least twice the number of domain |