diff options
author | t3sserakt <t3ss@posteo.de> | 2019-06-26 00:21:48 +0200 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2019-06-26 00:21:48 +0200 |
commit | c9cb240e053e9eff9c499d37484b6e1066ed4289 (patch) | |
tree | 1c264da4516ccc269b8838181f0262d071d3a53e | |
parent | 1efa5f25a04093f1d74e953ae2f2841768334edd (diff) | |
parent | f606540bcb19245aabd2f645cd9567260659ee4c (diff) | |
download | gnunet-c9cb240e053e9eff9c499d37484b6e1066ed4289.tar.gz gnunet-c9cb240e053e9eff9c499d37484b6e1066ed4289.zip |
Merge branch 'cadet_option' of ssh://gnunet.org/gnunet into cadet_option
-rw-r--r-- | src/cadet/cadet_api.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c index 4bd5911ce..825768034 100644 --- a/src/cadet/cadet_api.c +++ b/src/cadet/cadet_api.c | |||
@@ -1120,13 +1120,7 @@ GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle *h, | |||
1120 | msg->ccn = ch->ccn; | 1120 | msg->ccn = ch->ccn; |
1121 | msg->port = *port; | 1121 | msg->port = *port; |
1122 | msg->peer = *destination; | 1122 | msg->peer = *destination; |
1123 | <<<<<<< 17611641fe7da3d2711e1f20eaf2ee81faf0e702 | ||
1124 | msg->opt = htonl (options); | ||
1125 | GNUNET_MQ_send (h->mq, env); | 1123 | GNUNET_MQ_send (h->mq, env); |
1126 | ======= | ||
1127 | GNUNET_MQ_send (h->mq, | ||
1128 | env); | ||
1129 | >>>>>>> removed GNUNET_CADET_ChannelOption | ||
1130 | return ch; | 1124 | return ch; |
1131 | } | 1125 | } |
1132 | 1126 | ||