diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2019-01-24 14:18:17 +0100 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2019-01-24 14:21:57 +0100 |
| commit | 22a07d791bf74b7c6478058e8b1c91018b1bc2f7 (patch) | |
| tree | d9900b963cf331a3a6cb69061576c76800a88501 /src/pdesc.c | |
| parent | 476d6b28848f952c09a094e2227f20d69d4f1482 (diff) | |
| parent | cea2b50c81db45d3f0eb19c327d2cc04bc01e1d2 (diff) | |
Merge branch 'master' into releasev1.32
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'src/pdesc.c')
| -rw-r--r-- | src/pdesc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pdesc.c b/src/pdesc.c index 906f35c..51fa3ab 100644 --- a/src/pdesc.c +++ b/src/pdesc.c @@ -5,7 +5,7 @@ * Copyright (c) 2004-2011, Daniel Stoedle <daniels@cs.uit.no>, * Yellow Lemon Software. All rights reserved. * - * Copyright (c) 2017 Toni Uhlig <matzeton@googlemail.com> + * Copyright (c) 2017-2019, Toni Uhlig <matzeton@googlemail.com> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -56,7 +56,7 @@ * the descriptor chain. If the sock argument is 0, the function will establish * a TCP connection to the ip and port given by dst_ip, dst_port. */ -proxy_desc_t* create_and_insert_proxy_desc(uint16_t id_no, uint16_t icmp_id, +proxy_desc_t *create_and_insert_proxy_desc(uint16_t id_no, uint16_t icmp_id, int sock, struct sockaddr_in *addr, uint32_t dst_ip, uint32_t dst_port, uint32_t init_state, uint32_t type) { |