In message <[email protected]>, Alexey Dokuchaev writes:
> On Fri, Sep 11, 2015 at 08:48:17AM +0000, Cy Schubert wrote:
> > New Revision: 287653
> > URL: https://svnweb.freebsd.org/changeset/base/287653
> >
> > Log:
> > Revert $FreeBSD$.
> >
> > [...]
> > @@ -1,4 +1,4 @@
> > -/* $NetBSD: ip_state.c,v 1.4 2012/12/20 21:42:28 christos Exp $ */
> > +/* $FreeBSD$ */
> >
> > /*
> > * Copyright (C) 2012 by Darren Reed.
>
> If this file is part of the contrib sources, don't we usually keep both
> ident strings (helps to keep track of future NetBSD revisions, etc.)?
But it did have a $FreeBSD$ id at r255332. I inadvertently removed it in
r287651.
Index: ip_state.c
===================================================================
--- ip_state.c (revision 255332)
+++ ip_state.c (revision 287651)
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $NetBSD: ip_state.c,v 1.4 2012/12/20 21:42:28 christos Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -1054,7 +1054,7 @@
/* to pointers and adjusts running stats for the hash table as
appropriate. */
/*
*/
/* This function can fail if the filter rule has had a population policy
of */
-/* IP addresses used with stateful filteirng assigned to it.
*/
+/* IP addresses used with stateful filtering assigned to it.
*/
/*
*/
/* Locking: it is assumed that some kind of lock on ipf_state is held.
*/
/* Exits with is_lock initialised and held - *EVEN IF ERROR*.
*/
@@ -1081,7 +1081,7 @@
}
/*
- * If we could trust is_hv, then the modulous would not be needed,
+ * If we could trust is_hv, then the modulus would not be needed,
* but when running with IPFILTER_SYNC, this stops bad values.
*/
hv = is->is_hv % softs->ipf_state_size;
@@ -1672,6 +1672,10 @@
SBUMPD(ipf_state_stats, iss_bucket_full);
return 4;
}
+
+ /*
+ * No existing state; create new
+ */
KMALLOC(is, ipstate_t *);
if (is == NULL) {
SBUMPD(ipf_state_stats, iss_nomem);
@@ -1683,7 +1687,7 @@
is->is_rule = fr;
/*
- * Do not do the modulous here, it is done in ipf_state_insert().
+ * Do not do the modulus here, it is done in ipf_state_insert().
*/
if (fr != NULL) {
ipftq_t *tq;
@@ -1711,7 +1715,7 @@
/*
* It may seem strange to set is_ref to 2, but if stsave is not NULL
* then a copy of the pointer is being stored somewhere else and in
- * the end, it will expect to be able to do osmething with it.
+ * the end, it will expect to be able to do something with it.
*/
is->is_me = stsave;
if (stsave != NULL) {
--
Cheers,
Cy Schubert <[email protected]> or <[email protected]>
FreeBSD UNIX: <[email protected]> Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
