diff options
| author | Andreas Schneider <asn@samba.org> | 2014-05-21 10:58:48 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2014-09-01 09:48:43 +0200 |
| commit | d094f2c18684755bb204bb29d74dc0fe6256fa81 (patch) | |
| tree | 9c456354d78e35e0b2c9fd7ac8609fbd283855a1 /src | |
| parent | 016569e151f8a7d238f2b3401aac80fbc78d2b87 (diff) | |
| download | socket_wrapper-d094f2c18684755bb204bb29d74dc0fe6256fa81.tar.gz socket_wrapper-d094f2c18684755bb204bb29d74dc0fe6256fa81.tar.xz socket_wrapper-d094f2c18684755bb204bb29d74dc0fe6256fa81.zip | |
swrap: Rename swrap_marshall_packet().
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/socket_wrapper.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index b66fa8a..be48e18 100644 --- a/src/socket_wrapper.c +++ b/src/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; } |