[BACK]Return to misc.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/misc.h between version 1.21.2.2 and 1.22

version 1.21.2.2, 2006/02/03 02:53:44 version 1.22, 2005/04/09 04:32:54
Line 20 
Line 20 
 int      unset_nonblock(int);  int      unset_nonblock(int);
 void     set_nodelay(int);  void     set_nodelay(int);
 int      a2port(const char *);  int      a2port(const char *);
 int      a2tun(const char *, int *);  
 char    *hpdelim(char **);  char    *hpdelim(char **);
 char    *cleanhostname(char *);  char    *cleanhostname(char *);
 char    *colon(char *);  char    *colon(char *);
 long     convtime(const char *);  long     convtime(const char *);
 char    *tilde_expand_filename(const char *, uid_t);  char    *tilde_expand_filename(const char *, uid_t);
 char    *percent_expand(const char *, ...) __attribute__((__sentinel__));  
 char    *tohex(const u_char *, u_int);  
 void     sanitise_stdfd(void);  
   
 struct passwd *pwcopy(struct passwd *);  struct passwd *pwcopy(struct passwd *);
   
Line 38 
Line 34 
         u_int   num;          u_int   num;
         u_int   nalloc;          u_int   nalloc;
 };  };
 void     addargs(arglist *, char *, ...)  void     addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));
              __attribute__((format(printf, 2, 3)));  
 void     replacearg(arglist *, u_int, char *, ...)  
              __attribute__((format(printf, 3, 4)));  
 void     freeargs(arglist *);  
   
 /* readpass.c */  /* readpass.c */
   
Line 54 
Line 46 
 char    *read_passphrase(const char *, int);  char    *read_passphrase(const char *, int);
 int      ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));  int      ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));
 int      read_keyfile_line(FILE *, const char *, char *, size_t, u_long *);  int      read_keyfile_line(FILE *, const char *, char *, size_t, u_long *);
   
 int      tun_open(int, int);  
   
 /* Common definitions for ssh tunnel device forwarding */  
 #define SSH_TUNMODE_NO          0x00  
 #define SSH_TUNMODE_POINTOPOINT 0x01  
 #define SSH_TUNMODE_ETHERNET    0x02  
 #define SSH_TUNMODE_DEFAULT     SSH_TUNMODE_POINTOPOINT  
 #define SSH_TUNMODE_YES         (SSH_TUNMODE_POINTOPOINT|SSH_TUNMODE_ETHERNET)  
   
 #define SSH_TUNID_ANY           0x7fffffff  
 #define SSH_TUNID_ERR           (SSH_TUNID_ANY - 1)  
 #define SSH_TUNID_MAX           (SSH_TUNID_ANY - 2)  

Legend:
Removed from v.1.21.2.2  
changed lines
  Added in v.1.22