BSD 4_3_Reno release

[unix-history] / usr / src / sys / netiso / clnp_timer.c

diff --git a/usr/src/sys/netiso/clnp_timer.c b/usr/src/sys/netiso/clnp_timer.c
index a1651a7..bc2a73b 100644 (file)
--- a/usr/src/sys/netiso/clnp_timer.c
+++ b/usr/src/sys/netiso/clnp_timer.c
@@ -26,29 +26,27 @@ SOFTWARE.
  */
 /* $Header: clnp_timer.c,v 4.2 88/06/29 14:59:05 hagens Exp $ */
 /* $Source: /usr/argo/sys/netiso/RCS/clnp_timer.c,v $ */
  */
 /* $Header: clnp_timer.c,v 4.2 88/06/29 14:59:05 hagens Exp $ */
 /* $Source: /usr/argo/sys/netiso/RCS/clnp_timer.c,v $ */

+/*     @(#)clnp_timer.c        7.4 (Berkeley) 9/22/89 */

 
 #ifndef lint
 static char *rcsid = "$Header: clnp_timer.c,v 4.2 88/06/29 14:59:05 hagens Exp $";
 #endif lint
 
 
 #ifndef lint
 static char *rcsid = "$Header: clnp_timer.c,v 4.2 88/06/29 14:59:05 hagens Exp $";
 #endif lint
 

-#ifdef ISO
-
-#include "../h/types.h"
-#include "../h/param.h"
-#include "../h/mbuf.h"
-#include "../h/domain.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/errno.h"
+#include "param.h"
+#include "mbuf.h"
+#include "domain.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "errno.h"

 
 #include "../net/if.h"
 #include "../net/route.h"
 
 
 #include "../net/if.h"
 #include "../net/route.h"
 

-#include "../netiso/iso.h"
-#include "../netiso/clnp.h"
-#include "../netiso/clnp_stat.h"
-#include "../netiso/argo_debug.h"
+#include "iso.h"
+#include "clnp.h"
+#include "clnp_stat.h"
+#include "argo_debug.h"

 
 extern struct clnp_fragl *clnp_frags;
 
 
 extern struct clnp_fragl *clnp_frags;
 


@@ -75,11 +73,13 @@ register struct clnp_fragl  *cfh;   /* fragment header to delete */
        cf = cfh->cfl_frags;
        while (cf != NULL) {
                struct clnp_frag        *cf_next = cf->cfr_next;
        cf = cfh->cfl_frags;
        while (cf != NULL) {
                struct clnp_frag        *cf_next = cf->cfr_next;

+               INCSTAT(cns_fragdropped);

                m_freem(cf->cfr_data);
                cf = cf_next;
        }
 
        /* free the copy of the header */
                m_freem(cf->cfr_data);
                cf = cf_next;
        }
 
        /* free the copy of the header */

+       INCSTAT(cns_fragdropped);

        m_freem(cfh->cfl_orighdr);
 
        if (clnp_frags == cfh) {
        m_freem(cfh->cfl_orighdr);
 
        if (clnp_frags == cfh) {


@@ -121,6 +121,7 @@ clnp_slowtimo()
        while (cfh != NULL) {
                if (--cfh->cfl_ttl == 0) {
                        cfh = clnp_freefrags(cfh);
        while (cfh != NULL) {
                if (--cfh->cfl_ttl == 0) {
                        cfh = clnp_freefrags(cfh);

+                       INCSTAT(cns_fragtimeout);

                } else {
                        cfh = cfh->cfl_next;
                }
                } else {
                        cfh = cfh->cfl_next;
                }


@@ -147,5 +148,3 @@ clnp_drain()
        while (cfh != NULL)
                cfh = clnp_freefrags(cfh);
 }
        while (cfh != NULL)
                cfh = clnp_freefrags(cfh);
 }

-
-#endif ISO