comparison tcpfwd.h @ 1129:45830474d83c coverity

merge up to date, attempt to fix travis.yml
author Matt Johnston <matt@ucc.asn.au>
date Fri, 12 Jun 2015 23:02:15 +0800
parents 3d9519ec2b85
children 9169e4e7cbee
comparison
equal deleted inserted replaced
1077:26c1f9b8f82e 1129:45830474d83c
29 29
30 struct TCPListener { 30 struct TCPListener {
31 31
32 /* For a direct-tcpip request, it's the addr/port we want the other 32 /* For a direct-tcpip request, it's the addr/port we want the other
33 * end to connect to */ 33 * end to connect to */
34 unsigned char *sendaddr; 34 char *sendaddr;
35 unsigned int sendport; 35 unsigned int sendport;
36 36
37 /* This is the address/port that we listen on. The address has special 37 /* This is the address/port that we listen on. The address has special
38 * meanings as per the rfc, "" for all interfaces, "localhost" for 38 * meanings as per the rfc, "" for all interfaces, "localhost" for
39 * localhost, or a normal interface name. */ 39 * localhost, or a normal interface name. */
40 unsigned char *listenaddr; 40 char *listenaddr;
41 unsigned int listenport; 41 unsigned int listenport;
42 /* The address that the remote host asked to listen on */ 42 /* The address that the remote host asked to listen on */
43 unsigned char *request_listenaddr; 43 char *request_listenaddr;
44 44
45 const struct ChanType *chantype; 45 const struct ChanType *chantype;
46 enum {direct, forwarded} tcp_type; 46 enum {direct, forwarded} tcp_type;
47 }; 47 };
48 48
49 /* A forwarding entry */ 49 /* A forwarding entry */
50 struct TCPFwdEntry { 50 struct TCPFwdEntry {
51 const unsigned char* connectaddr; 51 const char *connectaddr;
52 unsigned int connectport; 52 unsigned int connectport;
53 const unsigned char* listenaddr; 53 const char *listenaddr;
54 unsigned int listenport; 54 unsigned int listenport;
55 unsigned int have_reply; /* is set to 1 after a reply has been received 55 unsigned int have_reply; /* is set to 1 after a reply has been received
56 when setting up the forwarding */ 56 when setting up the forwarding */
57 }; 57 };
58 58