diff options
Diffstat (limited to 'misc.h')
-rw-r--r-- | misc.h | 23 |
1 files changed, 21 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.h,v 1.25 2005/07/14 04:00:43 dtucker Exp $ */ | 1 | /* $OpenBSD: misc.h,v 1.29 2006/01/31 10:19:02 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -20,6 +20,7 @@ int set_nonblock(int); | |||
20 | int unset_nonblock(int); | 20 | int unset_nonblock(int); |
21 | void set_nodelay(int); | 21 | void set_nodelay(int); |
22 | int a2port(const char *); | 22 | int a2port(const char *); |
23 | int a2tun(const char *, int *); | ||
23 | char *hpdelim(char **); | 24 | char *hpdelim(char **); |
24 | char *cleanhostname(char *); | 25 | char *cleanhostname(char *); |
25 | char *colon(char *); | 26 | char *colon(char *); |
@@ -27,6 +28,7 @@ long convtime(const char *); | |||
27 | char *tilde_expand_filename(const char *, uid_t); | 28 | char *tilde_expand_filename(const char *, uid_t); |
28 | char *percent_expand(const char *, ...) __attribute__((__sentinel__)); | 29 | char *percent_expand(const char *, ...) __attribute__((__sentinel__)); |
29 | char *tohex(const u_char *, u_int); | 30 | char *tohex(const u_char *, u_int); |
31 | void sanitise_stdfd(void); | ||
30 | 32 | ||
31 | struct passwd *pwcopy(struct passwd *); | 33 | struct passwd *pwcopy(struct passwd *); |
32 | 34 | ||
@@ -36,7 +38,11 @@ struct arglist { | |||
36 | u_int num; | 38 | u_int num; |
37 | u_int nalloc; | 39 | u_int nalloc; |
38 | }; | 40 | }; |
39 | void addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3))); | 41 | void addargs(arglist *, char *, ...) |
42 | __attribute__((format(printf, 2, 3))); | ||
43 | void replacearg(arglist *, u_int, char *, ...) | ||
44 | __attribute__((format(printf, 3, 4))); | ||
45 | void freeargs(arglist *); | ||
40 | 46 | ||
41 | /* readpass.c */ | 47 | /* readpass.c */ |
42 | 48 | ||
@@ -48,3 +54,16 @@ void addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3))); | |||
48 | char *read_passphrase(const char *, int); | 54 | char *read_passphrase(const char *, int); |
49 | int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2))); | 55 | int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2))); |
50 | int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *); | 56 | int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *); |
57 | |||
58 | int tun_open(int, int); | ||
59 | |||
60 | /* Common definitions for ssh tunnel device forwarding */ | ||
61 | #define SSH_TUNMODE_NO 0x00 | ||
62 | #define SSH_TUNMODE_POINTOPOINT 0x01 | ||
63 | #define SSH_TUNMODE_ETHERNET 0x02 | ||
64 | #define SSH_TUNMODE_DEFAULT SSH_TUNMODE_POINTOPOINT | ||
65 | #define SSH_TUNMODE_YES (SSH_TUNMODE_POINTOPOINT|SSH_TUNMODE_ETHERNET) | ||
66 | |||
67 | #define SSH_TUNID_ANY 0x7fffffff | ||
68 | #define SSH_TUNID_ERR (SSH_TUNID_ANY - 1) | ||
69 | #define SSH_TUNID_MAX (SSH_TUNID_ANY - 2) | ||