diff options
author | Bart Polot <bart@net.in.tum.de> | 2014-06-24 15:17:32 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2014-06-24 15:17:32 +0000 |
commit | 25d1e3b1793fb0b23b7f040f84fdb0d8d767087d (patch) | |
tree | 5bf10595102f72b6c949652d9a4db50642e18253 | |
parent | 9186942be334e91e8d580ffc500b9f9630d66c1c (diff) | |
download | gnunet-25d1e3b1793fb0b23b7f040f84fdb0d8d767087d.tar.gz gnunet-25d1e3b1793fb0b23b7f040f84fdb0d8d767087d.zip |
- don't use payload_type on non-payload messages
-rw-r--r-- | src/cadet/gnunet-service-cadet_connection.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c index 00af5351c..3dd19950b 100644 --- a/src/cadet/gnunet-service-cadet_connection.c +++ b/src/cadet/gnunet-service-cadet_connection.c | |||
@@ -807,8 +807,7 @@ send_connection_ack (struct CadetConnection *connection, int fwd) | |||
807 | LOG (GNUNET_ERROR_TYPE_INFO, "===> {%14s ACK} on connection %s\n", | 807 | LOG (GNUNET_ERROR_TYPE_INFO, "===> {%14s ACK} on connection %s\n", |
808 | GC_f2s (!fwd), GCC_2s (connection)); | 808 | GC_f2s (!fwd), GCC_2s (connection)); |
809 | GCP_queue_add (get_hop (connection, fwd), NULL, | 809 | GCP_queue_add (get_hop (connection, fwd), NULL, |
810 | GNUNET_MESSAGE_TYPE_CADET_CONNECTION_ACK, | 810 | GNUNET_MESSAGE_TYPE_CADET_CONNECTION_ACK, 0, 0, |
811 | GNUNET_MESSAGE_TYPE_CADET_CONNECTION_ACK, 0, | ||
812 | sizeof (struct GNUNET_CADET_ConnectionACK), | 811 | sizeof (struct GNUNET_CADET_ConnectionACK), |
813 | connection, fwd, &conn_message_sent, NULL); | 812 | connection, fwd, &conn_message_sent, NULL); |
814 | connection->pending_messages++; | 813 | connection->pending_messages++; |
@@ -876,10 +875,8 @@ send_broken_unknown (const struct GNUNET_CADET_Hash *connection_id, | |||
876 | else | 875 | else |
877 | memset (&msg->peer2, 0, sizeof (msg->peer2)); | 876 | memset (&msg->peer2, 0, sizeof (msg->peer2)); |
878 | neighbor = GCP_get (peer_id); | 877 | neighbor = GCP_get (peer_id); |
879 | GCP_queue_add (neighbor, msg, | 878 | GCP_queue_add (neighbor, msg, GNUNET_MESSAGE_TYPE_CADET_CONNECTION_BROKEN, |
880 | GNUNET_MESSAGE_TYPE_CADET_CONNECTION_BROKEN, | 879 | 0, 2, sizeof (struct GNUNET_CADET_ConnectionBroken), |
881 | GNUNET_MESSAGE_TYPE_CADET_CONNECTION_BROKEN, 2, | ||
882 | sizeof (struct GNUNET_CADET_ConnectionBroken), | ||
883 | NULL, GNUNET_SYSERR, /* connection, fwd */ | 880 | NULL, GNUNET_SYSERR, /* connection, fwd */ |
884 | NULL, NULL); /* continuation */ | 881 | NULL, NULL); /* continuation */ |
885 | } | 882 | } |
@@ -3046,8 +3043,7 @@ GCC_send_create (struct CadetConnection *connection) | |||
3046 | 3043 | ||
3047 | connection->maintenance_q = | 3044 | connection->maintenance_q = |
3048 | GCP_queue_add (get_next_hop (connection), NULL, | 3045 | GCP_queue_add (get_next_hop (connection), NULL, |
3049 | GNUNET_MESSAGE_TYPE_CADET_CONNECTION_CREATE, | 3046 | GNUNET_MESSAGE_TYPE_CADET_CONNECTION_CREATE, 0, 0, |
3050 | GNUNET_MESSAGE_TYPE_CADET_CONNECTION_CREATE, 0, | ||
3051 | size, connection, GNUNET_YES, &conn_message_sent, NULL); | 3047 | size, connection, GNUNET_YES, &conn_message_sent, NULL); |
3052 | 3048 | ||
3053 | state = GCT_get_cstate (connection->t); | 3049 | state = GCT_get_cstate (connection->t); |