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

Diff for /src/usr.bin/ssh/log.h between version 1.28 and 1.29

version 1.28, 2020/10/18 11:14:27 version 1.29, 2020/10/18 11:21:59
Line 16 
Line 16 
 #define SSH_LOG_H  #define SSH_LOG_H
   
 #include <stdarg.h> /* va_list */  #include <stdarg.h> /* va_list */
   #include <ssherr.h> /* ssh_err() */
   
 /* Supported syslog facilities and levels. */  /* Supported syslog facilities and levels. */
 typedef enum {  typedef enum {
Line 65 
Line 66 
 void     cleanup_exit(int) __attribute__((noreturn));  void     cleanup_exit(int) __attribute__((noreturn));
   
 void     sshlog(const char *, const char *, int, int,  void     sshlog(const char *, const char *, int, int,
     LogLevel, const char *, ...) __attribute__((format(printf, 6, 7)));      LogLevel, const char *, const char *, ...)
       __attribute__((format(printf, 7, 8)));
 void     sshlogv(const char *, const char *, int, int,  void     sshlogv(const char *, const char *, int, int,
     LogLevel, const char *, va_list);      LogLevel, const char *, const char *, va_list);
 void     sshsigdie(const char *, const char *, int, int,  void     sshsigdie(const char *, const char *, int, int,
     LogLevel, const char *, ...) __attribute__((noreturn))      LogLevel, const char *, const char *, ...) __attribute__((noreturn))
     __attribute__((format(printf, 6, 7)));      __attribute__((format(printf, 7, 8)));
 void     sshlogdie(const char *, const char *, int, int,  void     sshlogdie(const char *, const char *, int, int,
     LogLevel, const char *, ...) __attribute__((noreturn))      LogLevel, const char *, const char *, ...) __attribute__((noreturn))
     __attribute__((format(printf, 6, 7)));      __attribute__((format(printf, 7, 8)));
 void     sshfatal(const char *, const char *, int, int,  void     sshfatal(const char *, const char *, int, int,
     LogLevel, const char *, ...) __attribute__((noreturn))      LogLevel, const char *, const char *, ...) __attribute__((noreturn))
     __attribute__((format(printf, 6, 7)));      __attribute__((format(printf, 7, 8)));
   
 #define do_log2(level, ...)     sshlog(__FILE__, __func__, __LINE__, 0, level, __VA_ARGS__)  #define do_log2(level, ...)     sshlog(__FILE__, __func__, __LINE__, 0, level, NULL, __VA_ARGS__)
 #define debug3(...)             sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_DEBUG3, __VA_ARGS__)  #define debug3(...)             sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_DEBUG3, NULL, __VA_ARGS__)
 #define debug2(...)             sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_DEBUG2, __VA_ARGS__)  #define debug2(...)             sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_DEBUG2, NULL, __VA_ARGS__)
 #define debug(...)              sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_DEBUG1, __VA_ARGS__)  #define debug(...)              sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_DEBUG1, NULL, __VA_ARGS__)
 #define verbose(...)            sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_VERBOSE, __VA_ARGS__)  #define verbose(...)            sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_VERBOSE, NULL, __VA_ARGS__)
 #define logit(...)              sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_INFO, __VA_ARGS__)  #define logit(...)              sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_INFO, NULL, __VA_ARGS__)
 #define error(...)              sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_ERROR, __VA_ARGS__)  #define error(...)              sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_ERROR, NULL, __VA_ARGS__)
 #define fatal(...)              sshfatal(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_FATAL, __VA_ARGS__)  #define fatal(...)              sshfatal(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_FATAL, NULL, __VA_ARGS__)
 #define logdie(...)             sshlogdie(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_ERROR, __VA_ARGS__)  #define logdie(...)             sshlogdie(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_ERROR, NULL, __VA_ARGS__)
 #define sigdie(...)             sshsigdie(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_ERROR, __VA_ARGS__)  #define sigdie(...)             sshsigdie(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_ERROR, NULL, __VA_ARGS__)
   
   /* Variants that prepend the caller's function */
   #define do_log2_f(level, ...)   sshlog(__FILE__, __func__, __LINE__, 1, level, NULL, __VA_ARGS__)
   #define debug3_f(...)           sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_DEBUG3, NULL, __VA_ARGS__)
   #define debug2_f(...)           sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_DEBUG2, NULL, __VA_ARGS__)
   #define debug_f(...)            sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_DEBUG1, NULL, __VA_ARGS__)
   #define verbose_f(...)          sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_VERBOSE, NULL, __VA_ARGS__)
   #define logit_f(...)            sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_INFO, NULL, __VA_ARGS__)
   #define error_f(...)            sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_ERROR, NULL, __VA_ARGS__)
   #define fatal_f(...)            sshfatal(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_FATAL, NULL, __VA_ARGS__)
   #define logdie_f(...)           sshlogdie(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_ERROR, NULL, __VA_ARGS__)
   #define sigdie_f(...)           sshsigdie(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_ERROR, NULL, __VA_ARGS__)
   
   /* Variants that appends a ssh_err message */
   #define do_log2_r(r, level, ...) sshlog(__FILE__, __func__, __LINE__, 0, level, ssh_err(r), __VA_ARGS__)
   #define debug3_r(r, ...)        sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_DEBUG3, ssh_err(r), __VA_ARGS__)
   #define debug2_r(r, ...)        sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_DEBUG2, ssh_err(r), __VA_ARGS__)
   #define debug_r(r, ...)         sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_DEBUG1, ssh_err(r), __VA_ARGS__)
   #define verbose_r(r, ...)       sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_VERBOSE, ssh_err(r), __VA_ARGS__)
   #define logit_r(r, ...)         sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_INFO, ssh_err(r), __VA_ARGS__)
   #define error_r(r, ...)         sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_ERROR, ssh_err(r), __VA_ARGS__)
   #define fatal_r(r, ...)         sshfatal(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_FATAL, ssh_err(r), __VA_ARGS__)
   #define logdie_r(r, ...)        sshlogdie(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_ERROR, ssh_err(r), __VA_ARGS__)
   #define sigdie_r(r, ...)        sshsigdie(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_ERROR, ssh_err(r), __VA_ARGS__)
   #define do_log2_fr(r, level, ...) sshlog(__FILE__, __func__, __LINE__, 1, level, ssh_err(r), __VA_ARGS__)
   #define debug3_fr(r, ...)       sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_DEBUG3, ssh_err(r), __VA_ARGS__)
   #define debug2_fr(r, ...)       sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_DEBUG2, ssh_err(r), __VA_ARGS__)
   #define debug_fr(r, ...)        sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_DEBUG1, ssh_err(r), __VA_ARGS__)
   #define verbose_fr(r, ...)      sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_VERBOSE, ssh_err(r), __VA_ARGS__)
   #define logit_fr(r, ...)        sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_INFO, ssh_err(r), __VA_ARGS__)
   #define error_fr(r, ...)        sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_ERROR, ssh_err(r), __VA_ARGS__)
   #define fatal_fr(r, ...)        sshfatal(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_FATAL, ssh_err(r), __VA_ARGS__)
   #define logdie_fr(r, ...)       sshlogdie(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_ERROR, ssh_err(r), __VA_ARGS__)
   #define sigdie_fr(r, ...)       sshsigdie(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_ERROR, ssh_err(r), __VA_ARGS__)
   
 #endif  #endif
Legend:
Removed from v.1.28  
changed lines
  Added in v.1.29