X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=endpoint.cpp;h=e9c680f3315d303d31d7bceafb6335f6a57db5df;hp=b5d6f642839cec494efc75ac7829f500f9024ebf;hb=6bf7c7f9db360d6031417b012dcb0e90e2251cd6;hpb=5a22e57828617abc14e27814ee918cc63b96fd46

diff --git a/endpoint.cpp b/endpoint.cpp
index b5d6f64..e9c680f 100644
--- a/endpoint.cpp
+++ b/endpoint.cpp
@@ -9,10 +9,9 @@
 **                                                                           **
 \*****************************************************************************/ 
 
-#include <stdio.h>
 #include "main.h"
 
-unsigned long epoint_serial = 1; /* initial value must be 1, because 0== no epoint */
+unsigned int epoint_serial = 1; /* initial value must be 1, because 0== no epoint */
 
 class Endpoint *epoint_first = NULL;
 
@@ -20,7 +19,7 @@ class Endpoint *epoint_first = NULL;
 /*
  * find the epoint with epoint_id
  */ 
-class Endpoint *find_epoint_id(unsigned long epoint_id)
+class Endpoint *find_epoint_id(unsigned int epoint_id)
 {
 	class Endpoint *epoint = epoint_first;
 
@@ -39,7 +38,7 @@ class Endpoint *find_epoint_id(unsigned long epoint_id)
 /*
  * endpoint constructor (link with either port or join id)
  */
-Endpoint::Endpoint(unsigned long port_id, unsigned long join_id, unsigned long use_epoint_id)
+Endpoint::Endpoint(unsigned int port_id, unsigned int join_id)
 {
 	class Port *port;
 	class Endpoint **epointpointer;
@@ -60,10 +59,7 @@ Endpoint::Endpoint(unsigned long port_id, unsigned long join_id, unsigned long u
 	*epointpointer = this;
 
 	/* serial */
-	if (use_epoint_id)
-		ep_serial = use_epoint_id;
-	else
-		ep_serial = epoint_serial++;
+	ep_serial = epoint_serial++;
 
 	/* link to join or port */
 	if (port_id)
@@ -71,7 +67,7 @@ Endpoint::Endpoint(unsigned long port_id, unsigned long join_id, unsigned long u
 		port = find_port_id(port_id);
 		if (port)
 		{
-			if ((port->p_type&PORT_CLASS_mISDN_MASK) == PORT_CLASS_mISDN_DSS1)
+			if ((port->p_type&PORT_CLASS_MASK) == PORT_CLASS_mISDN)
 				earlyb = ((class PmISDN *)port)->p_m_mISDNport->earlyb;
 			if (!portlist_new(port_id, port->p_type, earlyb))
 				FATAL("No memory for portlist.\n");
@@ -142,7 +138,7 @@ Endpoint::~Endpoint(void)
 
 /* create new portlist relation
  */
-struct port_list *Endpoint::portlist_new(unsigned long port_id, int port_type, int earlyb)
+struct port_list *Endpoint::portlist_new(unsigned int port_id, int port_type, int earlyb)
 {
 	struct port_list *portlist, **portlistpointer;