[Linuxisns-commit] isnsNT/isnsserver/include iSNSdebug.h,1.2,1.3

[Robert W. <wrw...@us...>]

Update of /cvsroot/linuxisns/isnsNT/isnsserver/include
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv17288/include

Modified Files:
	iSNSdebug.h 
Log Message:
Add logging system

Index: iSNSdebug.h
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNSdebug.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iSNSdebug.h	2 Apr 2002 20:56:54 -0000	1.2
--- iSNSdebug.h	7 Aug 2007 14:41:47 -0000	1.3
***************
*** 41,44 ****
--- 41,46 ----
  #define _SNSdebug_h_
  
+ #include <syslog.h>
+ 
  #define LO_DETAIL 1
  #define HI_DETAIL 2
***************
*** 78,81 ****
--- 80,85 ----
  extern char sns_errmsg[];
  
+ extern int daemon_state;
+ 
  /*
   * Function declaration.
***************
*** 90,94 ****
  void ISNSDisplayMsg        (ISNS_Msg *msg);
  void ISNSDisplay_Hdr_Info  (ISNS_Msg *msg); 
- /* void ISNSDisplay_DbData    (SOIP_DB_Entry *entry, ISNS_Devi_Key *key_type, int level); */
  void ISNSDisplay_DbData(ISNS_Key *p_key, SOIP_DB_Entry *p_entry, int detail);
  void ISNSDisplay_Port_Name (SOIP_Port_Name *p_port, char *p_name);
--- 94,97 ----
***************
*** 105,109 ****
  void ISNSDisplay_Zone_Tag  (SOIP_Zone *p_zone);
  void ISNSDisplay_Zone_Priority (uint32_t *zone_priority);
- /* void ISNSDisplay_RSCN_List (SOIP_RSCN_List *p_rscn); */
  void ISNSDisplay_Zone      (uint32_t *zone_tag);
  void ISNSDisplay_HardAddr  (SOIP_Hard_Addr *hard_addr);
--- 108,111 ----
***************
*** 121,162 ****
  void ParsePDU (char *buffer);
  
- #ifdef SNS_LOG_ENABLED
- typedef unsigned int u32;
- extern void sys_error_log(u32 errCode, char *msg, u32 p1, u32 p2, u32 p3, u32 p4, u32 p5, u32 p6);
- #define SNS_FATAL(ec, msg, p1) sys_error_log(ERR_MODULE_SNS|ec, msg, p1,0,0,0,0,0)
- #define SNS_WARN(ec, msg, p1, p2, p3) sys_error_log(ERR_MODULE_SNS|ec, msg, p1, p2, p3, 0, 0, 0)
- #else
- #define SNS_FATAL(ec, msg, p1) printf("SNS_FATAL: %s", msg);
- #define SNS_WARN(ec, msg, p1, p2, p3) printf("SNS_WARN: (%d %d %d) %s", p1, p2, p3, msg);
- #endif
- 
  #ifdef SNS_DEBUG
  
!   /* debugs for 1 to 4 parameters */
! #define DEBUG_0(level, format)   ((level) ? printf ("%s %d " #format "\n",  __FILE__, __LINE__): 0)
! #define DEBUG_1(level, format, arg1)   ((level) ? printf ("%s %d " #format "\n",  __FILE__, __LINE__, (arg1)): 0)
! #define DEBUG_2(level, format, arg1, arg2)   ((level) ? printf ("%s %d " #format "\n",  __FILE__, __LINE__, (arg1), (arg2)): 0)
! #define DEBUG_3(level, format, arg1, arg2, arg3)   ((level) ? printf ("%s %d " #format "\n",  __FILE__, __LINE__, (arg1), (arg2), (arg3)): 0)
! #define DEBUG_4(level, format, arg1, arg2, arg3, arg4)   ((level) ? printf ("%s %d " #format "\n",  __FILE__, __LINE__, (arg1), (arg2), (arg3), (arg4)): 0)
  
  #else
  
! #define DEBUG_0(level, format)
! #define DEBUG_1(level, format, arg1)
! #define DEBUG_2(level, format, arg1, arg2)
! #define DEBUG_3(level, format, arg1, arg2, arg3)
! #define DEBUG_4(level, format, arg1, arg2, arg3, arg4)
  
  #endif
  
  
! #ifdef SNS_DEBUG
!   /* debug display by function calls */
! 
! #define DEBUG_DISPLAY(level, func) ((level) ? (*func) ():0)
! #define DEBUG_DISPLAY_1(level, func, arg1) ((level) ? (*func) ((arg1)):0)
! #define DEBUG_DISPLAY_2(level, func, arg1, arg2) ((level) ? (*func) ((arg1), (arg2)):0)
  
! #endif
  
  #endif
--- 123,142 ----
  void ParsePDU (char *buffer);
  
  #ifdef SNS_DEBUG
  
! #define __DEBUG(level, format, ...) ((level) ? isns_log(LOG_DEBUG,"%s:%d\t" #format "\n", __FILE__,__LINE__, ##__VA_ARGS__ ) : 0)
  
  #else
  
! #define __DEBUG(level, format, ...)
  
  #endif
  
  
! #define __LOG_INFO(format, ...) isns_log(LOG_INFO,"%s:%d\t" format "\n", __FILE__,__LINE__,##__VA_ARGS__)
! #define __LOG_ERROR(format, ...) isns_log(LOG_ERR,"%s:%d\t" format "\n", __FILE__,__LINE__,##__VA_ARGS__)
! #define __LOG_WARNING(format, ...) isns_log(LOG_WARNING,"%s:%d\t" format "\n", __FILE__,__LINE__,##__VA_ARGS__)
  
! void isns_log(int level, char *format, ...);
  
  #endif