X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=trace.h;h=092c2dfe5c015d26b1eb7c7f35a3c5d50ae36cbf;hp=43578e6711914e973475e5cff4fee8b7e8d64f77;hb=79bd731c0db3e3202cfeed2af3fb217ae744b70f;hpb=da21ec0158f0be010a75d42c058fdc8891498b2d

diff --git a/trace.h b/trace.h
index 43578e6..092c2df 100644
--- a/trace.h
+++ b/trace.h
@@ -26,7 +26,6 @@
 #define L2_RELEASE_CON			0x0002f101
 #define L2_RELEASE_IND			0x0002f102
 #define L2_RELEASE_RES			0x0002f103
-#define L3_UNKNOWN			0x0003f200
 #define L3_ALERTING_REQ			0x00030100
 #define L3_ALERTING_IND			0x00030102
 #define L3_PROCEEDING_REQ		0x00030200
@@ -92,19 +91,14 @@
 #define L3_RETRIEVE_ACKNOWLEDGE_IND	0x00033302
 #define L3_RETRIEVE_REJECT_REQ		0x00033700
 #define L3_RETRIEVE_REJECT_IND		0x00033702
-#ifdef SOCKET_MISDN
-#define L3_ASSIGN_REQ			0x0003f000
-#define L3_ASSIGN_IND			0x0003f002
-#define L3_FREE_REQ			0x0003f100
-#define L3_FREE_IND			0x0003f102
-#else
-#define L3_NEW_CR_REQ			0x0003f000
-#define L3_NEW_CR_IND			0x0003f002
-#define L3_RELEASE_CR_REQ		0x0003f100
-#define L3_RELEASE_CR_IND		0x0003f102
-#endif
+#define L3_NEW_L3ID_REQ			0x0003f000
+#define L3_NEW_L3ID_IND			0x0003f002
+#define L3_RELEASE_L3ID_REQ		0x0003f100
+#define L3_RELEASE_L3ID_IND		0x0003f102
 #define L3_TIMEOUT_REQ			0x0003f200
 #define L3_TIMEOUT_IND			0x0003f202
+#define L3_UNKNOWN_REQ			0x0003ff00
+#define L3_UNKNOWN_IND			0x0003ff02
 
 
 struct trace_element {
@@ -121,11 +115,11 @@ struct trace {
 	char caller[64];
 	char dialing[64];
 	int direction;
-	unsigned long sec, usec;
+	unsigned int sec, usec;
 	
 	/* type */
 	int category;
-	unsigned long serial;
+	unsigned int serial;
 	char name[64];
 
 	/* elements */
@@ -140,11 +134,11 @@ struct trace {
 //#define CATEGORY_BC	0x04 check lcradmin help
 
 
-#define start_trace(port, interface, caller, dialing, direction, category, serial, name) _start_trace(__FUNCTION__, __LINE__, port, interface, caller, dialing, direction, category, serial, name)
-#define add_trace(name, sub, fmt, arg...) _add_trace(__FUNCTION__, __LINE__, name, sub, fmt, ## arg)
-#define end_trace() _end_trace(__FUNCTION__, __LINE__)
-void _start_trace(const char *__file, int line, int port, struct interface *interface, char *caller, char *dialing, int direction, int category, int serial, char *name);
-void _add_trace(const char *__file, int line, char *name, char *sub, const char *fmt, ...);
+#define start_trace(port, interface, caller, dialing, direction, category, serial, name) _start_trace(__FILE__, __LINE__, port, interface, caller, dialing, direction, category, serial, name)
+#define add_trace(name, sub, fmt, arg...) _add_trace(__FILE__, __LINE__, name, sub, fmt, ## arg)
+#define end_trace() _end_trace(__FILE__, __LINE__)
+void _start_trace(const char *__file, int line, int port, struct interface *interface, const char *caller, const char *dialing, int direction, int category, int serial, const char *name);
+void _add_trace(const char *__file, int line, const char *name, const char *sub, const char *fmt, ...);
 void _end_trace(const char *__file, int line);
 //char *print_trace(int port, char *interface, char *caller, char *dialing, int direction, char *category, char *name);