diff options
| -rw-r--r-- | hicn-light/src/hicn/config/configuration.c | 4 | ||||
| -rw-r--r-- | hicn-light/src/hicn/core/connection.c | 14 | ||||
| -rw-r--r-- | hicn-light/src/hicn/core/connection.h | 14 | ||||
| -rw-r--r-- | hicn-light/src/hicn/core/messageHandler.h | 81 | ||||
| -rw-r--r-- | hicn-light/src/hicn/io/hicnConnection.c | 58 | ||||
| -rw-r--r-- | hicn-light/src/hicn/io/hicnListener.c | 12 | ||||
| -rw-r--r-- | hicn-light/src/hicn/io/ioOperations.c | 7 | ||||
| -rw-r--r-- | hicn-light/src/hicn/io/ioOperations.h | 10 | ||||
| -rw-r--r-- | hicn-light/src/hicn/io/streamConnection.c | 93 | ||||
| -rw-r--r-- | hicn-light/src/hicn/io/streamConnection.h | 3 | ||||
| -rw-r--r-- | hicn-light/src/hicn/io/udpConnection.c | 41 | ||||
| -rw-r--r-- | hicn-light/src/hicn/io/udpListener.c | 11 | ||||
| -rw-r--r-- | hicn-light/src/hicn/utils/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | hicn-light/src/hicn/utils/commands.h | 2 |
14 files changed, 244 insertions, 108 deletions
diff --git a/hicn-light/src/hicn/config/configuration.c b/hicn-light/src/hicn/config/configuration.c index 6c64fb1c1..851e0a9a8 100644 --- a/hicn-light/src/hicn/config/configuration.c +++ b/hicn-light/src/hicn/config/configuration.c @@ -309,9 +309,7 @@ static void configuration_SendResponse(Configuration *config, struct iovec *msg, return; } - connection_SendCommandResponse(conn, msg); - // IoOperations *ops = connection_GetIoOperations(conn); - // streamState_SendCommandResponse(ops, msg); + connection_SendIOVBuffer(conn, msg, 2); } struct iovec *configuration_ProcessCreateTunnel(Configuration *config, diff --git a/hicn-light/src/hicn/core/connection.c b/hicn-light/src/hicn/core/connection.c index 36fb20ec9..61db61ba7 100644 --- a/hicn-light/src/hicn/core/connection.c +++ b/hicn-light/src/hicn/core/connection.c @@ -45,6 +45,7 @@ struct connection { // file/hicnLightControl) this value is set to false so // that a base station can not disable wldr at the client Wldr *wldr; + }; Connection *connection_Create(IoOperations *ops) { @@ -112,11 +113,12 @@ bool connection_Send(const Connection *conn, Message *message) { return false; } -bool connection_SendCommandResponse(const Connection *conn, struct iovec *msg){ +bool connection_SendIOVBuffer(const Connection *conn, struct iovec *msg, + size_t size) { parcAssertNotNull(conn, "Parameter conn must be non-null"); parcAssertNotNull(msg, "Parameter message must be non-null"); - return ioOperations_SendCommandResponse(conn->ops, msg); + return ioOperations_SendIOVBuffer(conn->ops, msg, size); } static void _sendProbe(Connection *conn, unsigned probeType, uint8_t *message) { @@ -132,6 +134,14 @@ static void _sendProbe(Connection *conn, unsigned probeType, uint8_t *message) { } } +bool connection_SendBuffer(const Connection *conn, u8 * buffer, size_t length) +{ + struct iovec iov[1]; + iov[0].iov_base = buffer; + iov[0].iov_len = length; + return connection_SendIOVBuffer(conn, iov, 1); +} + void connection_Probe(Connection *conn) { _sendProbe(conn, PACKET_TYPE_PROBE_REQUEST, NULL); } diff --git a/hicn-light/src/hicn/core/connection.h b/hicn-light/src/hicn/core/connection.h index efe8a66b9..9d7cd7c93 100644 --- a/hicn-light/src/hicn/core/connection.h +++ b/hicn-light/src/hicn/core/connection.h @@ -65,10 +65,17 @@ Connection *connection_Acquire(Connection *connection); bool connection_Send(const Connection *conn, Message *message); /** - * @function connection_SendCommandResponse - * @abstract Sends a response (ack/nack) for a command + * @function connection_SendIOVBuffer + * @abstract Sends an IOV buffer */ -bool connection_SendCommandResponse(const Connection *conn, struct iovec *msg); +bool connection_SendIOVBuffer(const Connection *conn, struct iovec *msg, + size_t size); + +/** + * @function connection_SendBuffer + * @abstract Sends a buffer + */ +bool connection_SendBuffer(const Connection *conn, u8 * buffer, size_t length); /** * Return the `IoOperations` instance associated with the specified `Connection` @@ -151,4 +158,5 @@ bool connection_WldrAutoStartAllowed(const Connection *conn); void connection_DetectLosses(Connection *conn, Message *message); void connection_HandleWldrNotification(Connection *conn, Message *message); + #endif // connection_h diff --git a/hicn-light/src/hicn/core/messageHandler.h b/hicn-light/src/hicn/core/messageHandler.h index 56f75c113..c1fc0481a 100644 --- a/hicn-light/src/hicn/core/messageHandler.h +++ b/hicn-light/src/hicn/core/messageHandler.h @@ -53,6 +53,10 @@ #define expected_lbl wldr_notification_lbl.expected_lbl #define received_lbl wldr_notification_lbl.received_lbl +#include <hicn/core/forwarder.h> + +#define CONNECTION_ID_UNDEFINED -1 + static inline uint8_t messageHandler_GetIPPacketType(const uint8_t *message) { return HICN_IP_VERSION(message); } @@ -162,6 +166,83 @@ static inline uint8_t messageHandler_NextHeaderType(const uint8_t *message) { } } +/* Forward declarations */ +static inline void * messageHandler_GetSource(const uint8_t *message); + +/* Helpers */ + +// NOTE: this function is generalized from the one in hICN listener and takes a +// forwarder as parameter +static inline +const Connection * +_getConnectionFromPacket(Forwarder * forwarder, Address * localAddress, Address *packetSourceAddress) +{ + if (!packetSourceAddress) + return NULL; + + AddressPair *pair = addressPair_Create(localAddress, + packetSourceAddress); + const Connection * conn = connectionTable_FindByAddressPair( + forwarder_GetConnectionTable(forwarder), pair); + addressPair_Release(&pair); + + return conn; +} + +static inline +Address * +_createAddressFromPacket(const uint8_t *msgBuffer) +{ + Address *packetAddr = NULL; + if (messageHandler_GetIPPacketType(msgBuffer) == IPv6_TYPE) { + struct sockaddr_in6 addr_in6; + addr_in6.sin6_family = AF_INET6; + addr_in6.sin6_port = htons(1234); + addr_in6.sin6_flowinfo = 0; + addr_in6.sin6_scope_id = 0; + memcpy(&addr_in6.sin6_addr, + (struct in6_addr *)messageHandler_GetSource(msgBuffer), 16); + packetAddr = addressCreateFromInet6(&addr_in6); + } else if (messageHandler_GetIPPacketType(msgBuffer) == IPv4_TYPE) { + struct sockaddr_in addr_in; + addr_in.sin_family = AF_INET; + addr_in.sin_port = htons(1234); + memcpy(&addr_in.sin_addr, + (struct in_addr *)messageHandler_GetSource(msgBuffer), 4); + packetAddr = addressCreateFromInet(&addr_in); + } + return packetAddr; +} + +/* Hooks */ + +/* ... */ + +/* Main hook handler */ + +/** + * \brief Handle incoming messages + * \param [in] forwarder - Reference to the Forwarder instance + * \param [in] connection_id - A hint on the connection ID on which the packet + * was received, CONNECTION_ID_UNDEFINED (-1) otherwise. + * \param [in] localAddress - Local listener address + * \param [in] messsage - Buffer possibly containing a hooked message + * \return Flag indicating whether the packet matched a hook and was + * (successfully or not) processed. + */ +static inline bool messageHandler_handleHooks(Forwarder * forwarder, + int connection_id, Address * localAddress, const uint8_t * message) +{ + /* ... */ + + return false; + +#if 0 // Enable and jump here when a handler has successfully processed the packet +END: + return true; +#endif +} + static inline bool messageHandler_IsTCP(const uint8_t *message) { if (messageHandler_NextHeaderType(message) != IPPROTO_TCP) return false; return true; diff --git a/hicn-light/src/hicn/io/hicnConnection.c b/hicn-light/src/hicn/io/hicnConnection.c index d9797786a..3c6f0612c 100644 --- a/hicn-light/src/hicn/io/hicnConnection.c +++ b/hicn-light/src/hicn/io/hicnConnection.c @@ -24,6 +24,7 @@ #include <src/hicn/config.h> #include <stdio.h> #include <string.h> +#include <sys/uio.h> #include <unistd.h> #include <hicn/core/message.h> @@ -75,7 +76,8 @@ typedef struct hicn_state { // Prototypes static bool _send(IoOperations *ops, const Address *nexthop, Message *message); -static bool _sendCommandResponse(IoOperations *ops, struct iovec *message); +static bool _sendIOVBuffer(IoOperations *ops, struct iovec *message, + size_t size); static const Address *_getRemoteAddress(const IoOperations *ops); static const AddressPair *_getAddressPair(const IoOperations *ops); static unsigned _getConnectionId(const IoOperations *ops); @@ -99,18 +101,20 @@ static const void *_streamConnection_Class(const IoOperations *ops) { return _ioOperationsGuid; } -static IoOperations _template = {.closure = NULL, - .send = &_send, - .sendCommandResponse = &_sendCommandResponse, - .getRemoteAddress = &_getRemoteAddress, - .getAddressPair = &_getAddressPair, - .getConnectionId = &_getConnectionId, - .isUp = &_isUp, - .isLocal = &_isLocal, - .destroy = &_destroy, - .class = &_streamConnection_Class, - .getConnectionType = &_getConnectionType, - .sendProbe = &_sendProbe}; +static IoOperations _template = { + .closure = NULL, + .send = &_send, + .sendIOVBuffer = &_sendIOVBuffer, + .getRemoteAddress = &_getRemoteAddress, + .getAddressPair = &_getAddressPair, + .getConnectionId = &_getConnectionId, + .isUp = &_isUp, + .isLocal = &_isLocal, + .destroy = &_destroy, + .class = &_streamConnection_Class, + .getConnectionType = &_getConnectionType, + .sendProbe = &_sendProbe, +}; // ================================================================= @@ -329,10 +333,30 @@ static bool _send(IoOperations *ops, const Address *dummy, Message *message) { return true; } -static bool _sendCommandResponse(IoOperations *ops, struct iovec *message) { - //XXX this should be nerver called since we do not handle control messages - //with hicn connections, so nothing to do here! - return false; +static bool _sendIOVBuffer(IoOperations *ops, struct iovec *message, + size_t size) { + parcAssertNotNull(ops, "Parameter ops must be non-null"); + parcAssertNotNull(message, "Parameter message must be non-null"); + + _HicnState *hicnConnState = (_HicnState *)ioOperations_GetClosure(ops); + + + ssize_t n = writev(hicnConnState->hicnListenerSocket, message, size); + if (n < 0) { + if (errno != EAGAIN && errno != EWOULDBLOCK) { + if (logger_IsLoggable(hicnConnState->logger, LoggerFacility_IO, + PARCLogLevel_Error)) { + size_t length = 0; + for (int i = 0; i < size; i++) + length += message[i].iov_len; + logger_Log(hicnConnState->logger, LoggerFacility_IO, PARCLogLevel_Error, + __func__, "Incorrect write length %zd, expected %zd: (%d) %s\n", + n, length, errno, strerror(errno)); + } + } + return false; + } + return true; } static list_connections_type _getConnectionType(const IoOperations *ops) { diff --git a/hicn-light/src/hicn/io/hicnListener.c b/hicn-light/src/hicn/io/hicnListener.c index 3f6cab94e..525cae31c 100644 --- a/hicn-light/src/hicn/io/hicnListener.c +++ b/hicn-light/src/hicn/io/hicnListener.c @@ -500,6 +500,7 @@ const Connection *_findConnectionFromPacket(HicnListener *hicn, return conn; } +#if 0 static Address *_createAddressFromPacket(uint8_t *msgBuffer) { Address *packetAddr = NULL; if (messageHandler_GetIPPacketType(msgBuffer) == IPv6_TYPE) { @@ -521,6 +522,7 @@ static Address *_createAddressFromPacket(uint8_t *msgBuffer) { } return packetAddr; } +#endif static void _handleProbeMessage(HicnListener *hicn, uint8_t *msgBuffer) { Address *packetAddr = _createAddressFromPacket(msgBuffer); @@ -691,16 +693,20 @@ static Message *_readMessage(HicnListener *hicn, int fd, uint8_t *msgBuffer) { _handleWldrNotification(hicn, msgBuffer); } else if (messageHandler_IsLoadBalancerProbe(msgBuffer)) { _handleProbeMessage(hicn, msgBuffer); - } #ifdef WITH_MAPME - else if (mapMe_isMapMe(msgBuffer)) { + } else if (mapMe_isMapMe(msgBuffer)) { /* This function triggers the handling of the MAP-Me message, and we * will return NULL so as to terminate the processing of this * msgBuffer. */ _handleMapMe(hicn, fd, msgBuffer); - } #endif /* WITH_MAPME */ + } + + if (messageHandler_handleHooks(hicn->forwarder, hicn->connection_id, + hicn->localAddress, msgBuffer)) + goto END; +END: return message; } diff --git a/hicn-light/src/hicn/io/ioOperations.c b/hicn-light/src/hicn/io/ioOperations.c index 53adc47c5..a9b763448 100644 --- a/hicn-light/src/hicn/io/ioOperations.c +++ b/hicn-light/src/hicn/io/ioOperations.c @@ -28,12 +28,11 @@ bool ioOperations_Send(IoOperations *ops, const Address *nexthop, return ops->send(ops, nexthop, message); } -bool ioOperations_SendCommandResponse(IoOperations *ops, - struct iovec *message) { - return ops->sendCommandResponse(ops, message); +bool ioOperations_SendIOVBuffer(IoOperations *ops, struct iovec *message, + size_t size) { + return ops->sendIOVBuffer(ops, message, size); } - const Address *ioOperations_GetRemoteAddress(const IoOperations *ops) { return ops->getRemoteAddress(ops); } diff --git a/hicn-light/src/hicn/io/ioOperations.h b/hicn-light/src/hicn/io/ioOperations.h index 115b017dc..c5e58d8b2 100644 --- a/hicn-light/src/hicn/io/ioOperations.h +++ b/hicn-light/src/hicn/io/ioOperations.h @@ -63,7 +63,8 @@ typedef struct io_ops IoOperations; struct io_ops { void *closure; bool (*send)(IoOperations *ops, const Address *nexthop, Message *message); - bool (*sendCommandResponse)(IoOperations *ops, struct iovec *message); + bool (*sendIOVBuffer)(IoOperations *ops, struct iovec *message, size_t + size); const Address *(*getRemoteAddress)(const IoOperations *ops); const AddressPair *(*getAddressPair)(const IoOperations *ops); bool (*isUp)(const IoOperations *ops); @@ -168,10 +169,10 @@ void ioOperations_Release(IoOperations **opsPtr); * @endcode */ bool ioOperations_Send(IoOperations *ops, const Address *nexthop, - Message *message); + Message *message); -bool ioOperations_SendCommandResponse(IoOperations *ops, - struct iovec *message); +bool ioOperations_SendIOVBuffer(IoOperations *ops, struct iovec *message, + size_t size); /** * A connection is made up of a local and a remote address. This function @@ -363,4 +364,5 @@ list_connections_type ioOperations_GetConnectionType(const IoOperations *ops); Ticks ioOperations_SendProbe(IoOperations *ops, unsigned probeType, uint8_t *message); + #endif // io_h diff --git a/hicn-light/src/hicn/io/streamConnection.c b/hicn-light/src/hicn/io/streamConnection.c index d9ba5a355..465e0c326 100644 --- a/hicn-light/src/hicn/io/streamConnection.c +++ b/hicn-light/src/hicn/io/streamConnection.c @@ -64,9 +64,9 @@ typedef struct stream_state { // Prototypes static bool _streamConnection_Send(IoOperations *ops, const Address *nexthop, - Message *message); -static bool _streamConnection_SendCommandResponse(IoOperations *ops, - struct iovec *msg); + Message *message); +static bool _streamConnection_SendIOVBuffer(IoOperations *ops, struct + iovec *msg, size_t size); static const Address *_streamConnection_GetRemoteAddress( const IoOperations *ops); static const AddressPair *_streamConnection_GetAddressPair( @@ -98,7 +98,7 @@ static const void *_streamConnection_Class(const IoOperations *ops) { static IoOperations _template = { .closure = NULL, .send = &_streamConnection_Send, - .sendCommandResponse = &_streamConnection_SendCommandResponse, + .sendIOVBuffer = &_streamConnection_SendIOVBuffer, .getRemoteAddress = &_streamConnection_GetRemoteAddress, .getAddressPair = &_streamConnection_GetAddressPair, .getConnectionId = &_streamConnection_GetConnectionId, @@ -286,52 +286,14 @@ static unsigned _streamConnection_GetConnectionId(const IoOperations *ops) { return stream->id; } -bool _streamConnection_SendCommandResponse(IoOperations *ops, - struct iovec *response) { +bool _streamConnection_SendIOVBuffer(IoOperations *ops, + struct iovec * message, size_t size) { parcAssertNotNull(ops, "Parameter ops must be non-null"); - parcAssertNotNull(response, "Parameter message must be non-null"); - _StreamState *conn = (_StreamState *)ioOperations_GetClosure(ops); - - bool success = false; - if (conn->isUp) { - PARCEventBuffer *buffer = - parcEventBuffer_GetQueueBufferOutput(conn->bufferEventVector); - size_t buffer_backlog = parcEventBuffer_GetLength(buffer); - parcEventBuffer_Destroy(&buffer); - - if (buffer_backlog < OUTPUT_QUEUE_BYTES) { - if (logger_IsLoggable(conn->logger, LoggerFacility_IO, - PARCLogLevel_Debug)) { - logger_Log( - conn->logger, LoggerFacility_IO, PARCLogLevel_Debug, __func__, - "connid %u Writing %zu bytes to buffer with backlog %zu bytes", - conn->id, - (response[0].iov_len + - response[1].iov_len), // NEW: take total lenght - buffer_backlog); - } + parcAssertNotNull(message, "Parameter message must be non-null"); - // NEW: write directly ino the parcEventQueue without passing through - // message - int failure = - parcEventQueue_Write(conn->bufferEventVector, response[0].iov_base, - response[0].iov_len) + - parcEventQueue_Write(conn->bufferEventVector, response[1].iov_base, - response[1].iov_len); + _StreamState *conn = (_StreamState *)ioOperations_GetClosure(ops); - if (failure == 0) { - success = true; - } - } else { - if (logger_IsLoggable(conn->logger, LoggerFacility_IO, - PARCLogLevel_Warning)) { - logger_Log(conn->logger, LoggerFacility_IO, PARCLogLevel_Warning, - __func__, - "connid %u Writing to buffer backlog %zu bytes DROP MESSAGE", - conn->id, buffer_backlog); - } - } - } else { + if (!conn->isUp) { if (logger_IsLoggable(conn->logger, LoggerFacility_IO, PARCLogLevel_Error)) { logger_Log( @@ -339,9 +301,44 @@ bool _streamConnection_SendCommandResponse(IoOperations *ops, "connid %u tried to send to down connection (isUp %d isClosed %d)", conn->id, conn->isUp, conn->isClosed); } + return false; } - return success; + PARCEventBuffer *buffer = + parcEventBuffer_GetQueueBufferOutput(conn->bufferEventVector); + size_t buffer_backlog = parcEventBuffer_GetLength(buffer); + parcEventBuffer_Destroy(&buffer); + + if (buffer_backlog >= OUTPUT_QUEUE_BYTES) { + if (logger_IsLoggable(conn->logger, LoggerFacility_IO, + PARCLogLevel_Warning)) { + logger_Log(conn->logger, LoggerFacility_IO, PARCLogLevel_Warning, + __func__, + "connid %u Writing to buffer backlog %zu bytes DROP MESSAGE", + conn->id, buffer_backlog); + } + return false; + } + + if (logger_IsLoggable(conn->logger, LoggerFacility_IO, + PARCLogLevel_Debug)) { + size_t length = 0; + for (int i = 0; i < size; i++) + length += message[i].iov_len; + + logger_Log( conn->logger, LoggerFacility_IO, PARCLogLevel_Debug, __func__, + "connid %u Writing %zu bytes to buffer with backlog %zu bytes", + conn->id, length, buffer_backlog); + } + + /* Write directly into the parcEventQueue without passing through message */ + for (int i = 0; i < size; i++) { + if (parcEventQueue_Write(conn->bufferEventVector, message[i].iov_base, + message[i].iov_len) != 0) + return false; + } + + return true; } /** diff --git a/hicn-light/src/hicn/io/streamConnection.h b/hicn-light/src/hicn/io/streamConnection.h index 2b312e771..f483d0b82 100644 --- a/hicn-light/src/hicn/io/streamConnection.h +++ b/hicn-light/src/hicn/io/streamConnection.h @@ -70,6 +70,7 @@ IoOperations *streamConnection_AcceptConnection(Forwarder *forwarder, int fd, IoOperations *streamConnection_OpenConnection(Forwarder *forwarder, AddressPair *pair, bool isLocal); -bool streamState_SendCommandResponse(IoOperations *ops, struct iovec *response); +bool streamState_SendIOVBuffer(IoOperations *ops, struct iovec *response, + size_t size); #endif // streamConnection_h diff --git a/hicn-light/src/hicn/io/udpConnection.c b/hicn-light/src/hicn/io/udpConnection.c index b057f03ff..69cbea0e1 100644 --- a/hicn-light/src/hicn/io/udpConnection.c +++ b/hicn-light/src/hicn/io/udpConnection.c @@ -61,7 +61,8 @@ typedef struct udp_state { // Prototypes static bool _send(IoOperations *ops, const Address *nexthop, Message *message); -static bool _sendCommandResponse(IoOperations *ops, struct iovec *message); +static bool _sendIOVBuffer(IoOperations *ops, struct iovec *message, + size_t size); static const Address *_getRemoteAddress(const IoOperations *ops); static const AddressPair *_getAddressPair(const IoOperations *ops); static unsigned _getConnectionId(const IoOperations *ops); @@ -71,6 +72,7 @@ static void _destroy(IoOperations **opsPtr); static list_connections_type _getConnectionType(const IoOperations *ops); static Ticks _sendProbe(IoOperations *ops, unsigned probeType, uint8_t *message); + /* * This assigns a unique pointer to the void * which we use * as a GUID for this class. @@ -84,18 +86,20 @@ static const void *_streamConnection_Class(const IoOperations *ops) { return _IoOperationsGuid; } -static IoOperations _template = {.closure = NULL, - .send = &_send, - .sendCommandResponse = &_sendCommandResponse, - .getRemoteAddress = &_getRemoteAddress, - .getAddressPair = &_getAddressPair, - .getConnectionId = &_getConnectionId, - .isUp = &_isUp, - .isLocal = &_isLocal, - .destroy = &_destroy, - .class = &_streamConnection_Class, - .getConnectionType = &_getConnectionType, - .sendProbe = &_sendProbe}; +static IoOperations _template = { + .closure = NULL, + .send = &_send, + .sendIOVBuffer = &_sendIOVBuffer, + .getRemoteAddress = &_getRemoteAddress, + .getAddressPair = &_getAddressPair, + .getConnectionId = &_getConnectionId, + .isUp = &_isUp, + .isLocal = &_isLocal, + .destroy = &_destroy, + .class = &_streamConnection_Class, + .getConnectionType = &_getConnectionType, + .sendProbe = &_sendProbe, +}; // ================================================================= @@ -263,7 +267,8 @@ static bool _send(IoOperations *ops, const Address *dummy, Message *message) { return true; } -static bool _sendCommandResponse(IoOperations *ops, struct iovec *message){ +static bool _sendIOVBuffer(IoOperations *ops, struct iovec *message, + size_t size) { parcAssertNotNull(ops, "Parameter ops must be non-null"); parcAssertNotNull(message, "Parameter message must be non-null"); _UdpState *udpConnState = (_UdpState *)ioOperations_GetClosure(ops); @@ -276,7 +281,7 @@ static bool _sendCommandResponse(IoOperations *ops, struct iovec *message){ udpConnState->peerAddress, udpConnState->peerAddressLength); - ssize_t writeLength = writev(udpConnState->udpListenerSocket, message, 2); + ssize_t writeLength = writev(udpConnState->udpListenerSocket, message, size); struct sockaddr any_address = {0}; any_address.sa_family = AF_UNSPEC; @@ -287,15 +292,15 @@ static bool _sendCommandResponse(IoOperations *ops, struct iovec *message){ return false; } #else - WSABUF dataBuf[2]; + WSABUF dataBuf[ARRAY_SIZE(message)]; DWORD BytesSent = 0; - for (int i = 0; i < 2; i++) { + for (int i = 0; i < ARRAY_SIZE(message); i++) { dataBuf[i].buf = message[i].iov_base; dataBuf[i].len = (ULONG)message[i].iov_len; } - int rc = WSASendTo(udpConnState->udpListenerSocket, dataBuf, 2, + int rc = WSASendTo(udpConnState->udpListenerSocket, dataBuf, ARRAY_SIZE(message), &BytesSent, 0, (SOCKADDR *)udpConnState->peerAddress, udpConnState->peerAddressLength, NULL, NULL); diff --git a/hicn-light/src/hicn/io/udpListener.c b/hicn-light/src/hicn/io/udpListener.c index e73896372..9b7cf60af 100644 --- a/hicn-light/src/hicn/io/udpListener.c +++ b/hicn-light/src/hicn/io/udpListener.c @@ -451,13 +451,18 @@ static Message *_readMessage(UdpListener *udp, int fd, } else if (messageHandler_IsLoadBalancerProbe(packet)) { *processed = true; _handleProbeMessage(udp, packet); - } #ifdef WITH_MAPME - else if (mapMe_isMapMe(packet)) { + } else if (mapMe_isMapMe(packet)) { *processed = true; forwarder_ProcessMapMe(udp->forwarder, packet, connid); - } #endif /* WITH_MAPME */ + } + + /* Generic hook handler */ + if (messageHandler_handleHooks(udp->forwarder, CONNECTION_ID_UNDEFINED, + udp->localAddress, packet)) + goto END; +END: return message; } diff --git a/hicn-light/src/hicn/utils/CMakeLists.txt b/hicn-light/src/hicn/utils/CMakeLists.txt index 7d438d157..0934fd366 100644 --- a/hicn-light/src/hicn/utils/CMakeLists.txt +++ b/hicn-light/src/hicn/utils/CMakeLists.txt @@ -33,4 +33,4 @@ list(APPEND SOURCE_FILES ) set(SOURCE_FILES ${SOURCE_FILES} PARENT_SCOPE) -set(HEADER_FILES ${HEADER_FILES} PARENT_SCOPE)
\ No newline at end of file +set(HEADER_FILES ${HEADER_FILES} PARENT_SCOPE) diff --git a/hicn-light/src/hicn/utils/commands.h b/hicn-light/src/hicn/utils/commands.h index 9527e5064..802e6bfa6 100644 --- a/hicn-light/src/hicn/utils/commands.h +++ b/hicn-light/src/hicn/utils/commands.h @@ -40,7 +40,7 @@ union commandAddr { }; typedef enum { - REQUEST_LIGHT = 0xc0, // this is a command + REQUEST_LIGHT = 0xc0, // this is a command RESPONSE_LIGHT, ACK_LIGHT, NACK_LIGHT, |