diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-03-01 17:29:45 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-03-01 17:29:45 +0000 |
commit | a398a70c4ecad6d37bf7ac009bd4b7d2bdecdbfb (patch) | |
tree | 790adf79843519599a7cfc8b62cafb6057bc3a82 /src/core | |
parent | f173684484e89722946a4fcb6755f3b054d14755 (diff) | |
download | gnunet-a398a70c4ecad6d37bf7ac009bd4b7d2bdecdbfb.tar.gz gnunet-a398a70c4ecad6d37bf7ac009bd4b7d2bdecdbfb.zip |
support multi-message encapsulations
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/gnunet-service-core.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c index 81a168b7f..b65d67513 100644 --- a/src/core/gnunet-service-core.c +++ b/src/core/gnunet-service-core.c | |||
@@ -2005,9 +2005,6 @@ create_neighbour (const struct GNUNET_PeerIdentity *pid) | |||
2005 | } | 2005 | } |
2006 | 2006 | ||
2007 | 2007 | ||
2008 | |||
2009 | |||
2010 | |||
2011 | /** | 2008 | /** |
2012 | * Handle CORE_SEND request. | 2009 | * Handle CORE_SEND request. |
2013 | * | 2010 | * |
@@ -2021,7 +2018,6 @@ handle_client_send (void *cls, | |||
2021 | const struct GNUNET_MessageHeader *message) | 2018 | const struct GNUNET_MessageHeader *message) |
2022 | { | 2019 | { |
2023 | const struct SendMessage *sm; | 2020 | const struct SendMessage *sm; |
2024 | const struct GNUNET_MessageHeader *mh; | ||
2025 | struct Neighbour *n; | 2021 | struct Neighbour *n; |
2026 | struct MessageEntry *prev; | 2022 | struct MessageEntry *prev; |
2027 | struct MessageEntry *pos; | 2023 | struct MessageEntry *pos; |
@@ -2043,14 +2039,6 @@ handle_client_send (void *cls, | |||
2043 | } | 2039 | } |
2044 | sm = (const struct SendMessage *) message; | 2040 | sm = (const struct SendMessage *) message; |
2045 | msize -= sizeof (struct SendMessage); | 2041 | msize -= sizeof (struct SendMessage); |
2046 | mh = (const struct GNUNET_MessageHeader *) &sm[1]; | ||
2047 | if (msize != ntohs (mh->size)) | ||
2048 | { | ||
2049 | GNUNET_break (0); | ||
2050 | if (client != NULL) | ||
2051 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | ||
2052 | return; | ||
2053 | } | ||
2054 | n = find_neighbour (&sm->peer); | 2042 | n = find_neighbour (&sm->peer); |
2055 | if (n == NULL) | 2043 | if (n == NULL) |
2056 | n = create_neighbour (&sm->peer); | 2044 | n = create_neighbour (&sm->peer); |
@@ -2120,7 +2108,7 @@ handle_client_send (void *cls, | |||
2120 | e->deadline = GNUNET_TIME_absolute_ntoh (sm->deadline); | 2108 | e->deadline = GNUNET_TIME_absolute_ntoh (sm->deadline); |
2121 | e->priority = ntohl (sm->priority); | 2109 | e->priority = ntohl (sm->priority); |
2122 | e->size = msize; | 2110 | e->size = msize; |
2123 | memcpy (&e[1], mh, msize); | 2111 | memcpy (&e[1], &sm[1], msize); |
2124 | 2112 | ||
2125 | /* insert, keep list sorted by deadline */ | 2113 | /* insert, keep list sorted by deadline */ |
2126 | prev = NULL; | 2114 | prev = NULL; |