diff options
author | Christian Fuchs <christian.fuchs@cfuchs.net> | 2013-09-11 12:20:03 +0000 |
---|---|---|
committer | Christian Fuchs <christian.fuchs@cfuchs.net> | 2013-09-11 12:20:03 +0000 |
commit | 30b74c15b7f76b0371495f79447a8aaebcc71636 (patch) | |
tree | c3a346f2ee2b695f5c895d617fe05a3c71528747 /src/scalarproduct/scalarproduct.h | |
parent | 70cb9504b1f82b0ee580a464ee1929cb0b314ff8 (diff) | |
download | gnunet-30b74c15b7f76b0371495f79447a8aaebcc71636.tar.gz gnunet-30b74c15b7f76b0371495f79447a8aaebcc71636.zip |
added propper shutdown task to SP-client
fixed a logics mixup in the SP-API between alice's client and bob's client-function
fixed a memory allocation bug in SP-API
adjusted message formats to use uint32_t instead of 16 for all element counts and mask lengths
Diffstat (limited to 'src/scalarproduct/scalarproduct.h')
-rw-r--r-- | src/scalarproduct/scalarproduct.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/scalarproduct/scalarproduct.h b/src/scalarproduct/scalarproduct.h index 9304c0c7e..02c6d8b21 100644 --- a/src/scalarproduct/scalarproduct.h +++ b/src/scalarproduct/scalarproduct.h | |||
@@ -73,12 +73,12 @@ struct GNUNET_SCALARPRODUCT_client_request | |||
73 | /** | 73 | /** |
74 | * how many elements the vector in payload contains | 74 | * how many elements the vector in payload contains |
75 | */ | 75 | */ |
76 | uint16_t element_count GNUNET_PACKED; | 76 | uint32_t element_count GNUNET_PACKED; |
77 | 77 | ||
78 | /** | 78 | /** |
79 | * how many bytes the mask has | 79 | * how many bytes the mask has |
80 | */ | 80 | */ |
81 | uint16_t mask_length GNUNET_PACKED; | 81 | uint32_t mask_length GNUNET_PACKED; |
82 | 82 | ||
83 | /** | 83 | /** |
84 | * the transaction/session key used to identify a session | 84 | * the transaction/session key used to identify a session |
@@ -108,12 +108,12 @@ struct GNUNET_SCALARPRODUCT_service_request { | |||
108 | /** | 108 | /** |
109 | * how many bytes the mask has | 109 | * how many bytes the mask has |
110 | */ | 110 | */ |
111 | uint16_t mask_length GNUNET_PACKED; | 111 | uint32_t mask_length GNUNET_PACKED; |
112 | 112 | ||
113 | /** | 113 | /** |
114 | * the length of the publickey contained within this message | 114 | * the length of the publickey contained within this message |
115 | */ | 115 | */ |
116 | uint16_t pk_length GNUNET_PACKED; | 116 | uint32_t pk_length GNUNET_PACKED; |
117 | 117 | ||
118 | /** | 118 | /** |
119 | * the transaction/session key used to identify a session | 119 | * the transaction/session key used to identify a session |
@@ -123,12 +123,12 @@ struct GNUNET_SCALARPRODUCT_service_request { | |||
123 | /** | 123 | /** |
124 | * how many elements the vector in payload contains | 124 | * how many elements the vector in payload contains |
125 | */ | 125 | */ |
126 | uint16_t element_count GNUNET_PACKED; | 126 | uint32_t element_count GNUNET_PACKED; |
127 | 127 | ||
128 | /** | 128 | /** |
129 | * how many elements are actually included after the mask was applied. | 129 | * how many elements are actually included after the mask was applied. |
130 | */ | 130 | */ |
131 | uint16_t used_element_count GNUNET_PACKED; | 131 | uint32_t used_element_count GNUNET_PACKED; |
132 | 132 | ||
133 | /** | 133 | /** |
134 | * followed by mask | public_key | vector[used_element_count] | 134 | * followed by mask | public_key | vector[used_element_count] |
@@ -148,12 +148,12 @@ struct GNUNET_SCALARPRODUCT_service_response { | |||
148 | /** | 148 | /** |
149 | * how many elements the vector in payload contains | 149 | * how many elements the vector in payload contains |
150 | */ | 150 | */ |
151 | uint16_t element_count GNUNET_PACKED; | 151 | uint32_t element_count GNUNET_PACKED; |
152 | 152 | ||
153 | /** | 153 | /** |
154 | * how many elements are actually included after the mask was applied. | 154 | * how many elements are actually included after the mask was applied. |
155 | */ | 155 | */ |
156 | uint16_t used_element_count GNUNET_PACKED; | 156 | uint32_t used_element_count GNUNET_PACKED; |
157 | 157 | ||
158 | /** | 158 | /** |
159 | * the transaction/session key used to identify a session | 159 | * the transaction/session key used to identify a session |