summaryrefslogtreecommitdiff
path: root/lib/socket_wrapper
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2014-10-02 07:13:10 +0200
committerAndreas Schneider <asn@cryptomilk.org>2014-10-02 09:35:10 +0200
commite64ea9cb79b804c299d0213b2cca207fb000a3b8 (patch)
tree414f6b23044643edf1503672ca79fb5aeb21febf /lib/socket_wrapper
parentc626aad36a9757d584b9f10f0ba55dda72499c50 (diff)
downloadsamba-e64ea9cb79b804c299d0213b2cca207fb000a3b8.tar.gz
swrap: Rename swrap_packet_init().
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'lib/socket_wrapper')
-rw-r--r--lib/socket_wrapper/socket_wrapper.c37
1 files changed, 22 insertions, 15 deletions
diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c
index 41dc07da45a..b66fa8a87d5 100644
--- a/lib/socket_wrapper/socket_wrapper.c
+++ b/lib/socket_wrapper/socket_wrapper.c
@@ -1672,17 +1672,17 @@ static const char *swrap_pcap_init_file(void)
return s;
}
-static uint8_t *swrap_packet_init(struct timeval *tval,
- const struct sockaddr *src,
- const struct sockaddr *dest,
- int socket_type,
- const uint8_t *payload,
- size_t payload_len,
- unsigned long tcp_seqno,
- unsigned long tcp_ack,
- unsigned char tcp_ctl,
- int unreachable,
- size_t *_packet_len)
+static uint8_t *swrap_pcap_packet_init(struct timeval *tval,
+ const struct sockaddr *src,
+ const struct sockaddr *dest,
+ int socket_type,
+ const uint8_t *payload,
+ size_t payload_len,
+ unsigned long tcp_seqno,
+ unsigned long tcp_ack,
+ unsigned char tcp_ctl,
+ int unreachable,
+ size_t *_packet_len)
{
uint8_t *base;
uint8_t *buf;
@@ -2193,10 +2193,17 @@ static uint8_t *swrap_marshall_packet(struct socket_info *si,
swrapGetTimeOfDay(&tv);
- return swrap_packet_init(&tv, src_addr, dest_addr, si->type,
- (const uint8_t *)buf, len,
- tcp_seqno, tcp_ack, tcp_ctl, unreachable,
- packet_len);
+ return swrap_pcap_packet_init(&tv,
+ src_addr,
+ dest_addr,
+ si->type,
+ (const uint8_t *)buf,
+ len,
+ tcp_seqno,
+ tcp_ack,
+ tcp_ctl,
+ unreachable,
+ packet_len);
}
static void swrap_dump_packet(struct socket_info *si,