Changeset cf3aee19 in mainline for uspace/srv/net/inetsrv/pdu.c
- Timestamp:
- 2015-06-17T23:45:24Z (9 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 523b17a
- Parents:
- fc7bf19 (diff), 2654afb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/inetsrv/pdu.c
rfc7bf19 rcf3aee19 298 298 /** Decode IPv4 datagram 299 299 * 300 * @param data Serialized IPv4 datagram 301 * @param size Length of serialized IPv4 datagram 302 * @param packet IP datagram structure to be filled 300 * @param data Serialized IPv4 datagram 301 * @param size Length of serialized IPv4 datagram 302 * @param link_id Link on which PDU was received 303 * @param packet IP datagram structure to be filled 303 304 * 304 305 * @return EOK on success … … 307 308 * 308 309 */ 309 int inet_pdu_decode(void *data, size_t size, inet_packet_t *packet) 310 int inet_pdu_decode(void *data, size_t size, service_id_t link_id, 311 inet_packet_t *packet) 310 312 { 311 313 log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_pdu_decode()"); … … 366 368 367 369 memcpy(packet->data, (uint8_t *) data + data_offs, packet->size); 370 packet->link_id = link_id; 368 371 369 372 return EOK; … … 372 375 /** Decode IPv6 datagram 373 376 * 374 * @param data Serialized IPv6 datagram 375 * @param size Length of serialized IPv6 datagram 376 * @param packet IP datagram structure to be filled 377 * @param data Serialized IPv6 datagram 378 * @param size Length of serialized IPv6 datagram 379 * @param link_id Link on which PDU was received 380 * @param packet IP datagram structure to be filled 377 381 * 378 382 * @return EOK on success … … 381 385 * 382 386 */ 383 int inet_pdu_decode6(void *data, size_t size, inet_packet_t *packet) 387 int inet_pdu_decode6(void *data, size_t size, service_id_t link_id, 388 inet_packet_t *packet) 384 389 { 385 390 log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_pdu_decode6()"); … … 457 462 458 463 memcpy(packet->data, (uint8_t *) data + data_offs, packet->size); 459 464 packet->link_id = link_id; 460 465 return EOK; 461 466 }
Note:
See TracChangeset
for help on using the changeset viewer.