diff options
| author | Andreas Schneider <asn@samba.org> | 2014-10-02 07:14:04 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2014-10-02 09:35:10 +0200 |
| commit | 7d4c6cf25d5f424156fa0a6f90673744c5eba18e (patch) | |
| tree | fe9556d519dbdc0bd2aef44412b48658fc459745 /lib/socket_wrapper | |
| parent | e64ea9cb79b804c299d0213b2cca207fb000a3b8 (diff) | |
| download | samba-7d4c6cf25d5f424156fa0a6f90673744c5eba18e.tar.gz | |
swrap: Rename swrap_marshall_packet().
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.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c index b66fa8a87d5..be48e184c29 100644 --- a/lib/socket_wrapper/socket_wrapper.c +++ b/lib/socket_wrapper/socket_wrapper.c @@ -1935,11 +1935,11 @@ static int swrap_get_pcap_fd(const char *fname) return fd; } -static uint8_t *swrap_marshall_packet(struct socket_info *si, - const struct sockaddr *addr, - enum swrap_packet_type type, - const void *buf, size_t len, - size_t *packet_len) +static uint8_t *swrap_pcap_marshall_packet(struct socket_info *si, + const struct sockaddr *addr, + enum swrap_packet_type type, + const void *buf, size_t len, + size_t *packet_len) { const struct sockaddr *src_addr; const struct sockaddr *dest_addr; @@ -2073,7 +2073,7 @@ static uint8_t *swrap_marshall_packet(struct socket_info *si, src_addr = si->peername; if (si->type == SOCK_DGRAM) { - return swrap_marshall_packet(si, si->peername, + return swrap_pcap_marshall_packet(si, si->peername, SWRAP_SENDTO_UNREACH, buf, len, packet_len); } @@ -2221,8 +2221,13 @@ static void swrap_dump_packet(struct socket_info *si, return; } - packet = swrap_marshall_packet(si, addr, type, buf, len, &packet_len); - if (!packet) { + packet = swrap_pcap_marshall_packet(si, + addr, + type, + buf, + len, + &packet_len); + if (packet == NULL) { return; } |