Navigation Bar Top Applications Support Documentation Vendors Search Index Top Top

CVS log for src/sys/netinet/accf_http.c

[BACK] Up to [freebsd] / src / sys / netinet

Request diff between arbitrary revisions

Default branch: MAIN

Revision 1.18 / (download) - annotate - [select for diffs], Mon Jun 1 21:17:03 2009 UTC (4 weeks, 4 days ago) by jhb
Branch: MAIN
CVS Tags: HEAD
Changes since 1.17: +20 -33 lines
Diff to previous 1.17 (colored) 

SVN rev 193272 on 2009-06-01 21:17:03Z by jhb

Rework socket upcalls to close some races with setup/teardown of upcalls.
- Each socket upcall is now invoked with the appropriate socket buffer
  locked.  It is not permissible to call soisconnected() with this lock
  held; however, so socket upcalls now return an integer value.  The two
  possible values are SU_OK and SU_ISCONNECTED.  If an upcall returns
  SU_ISCONNECTED, then the soisconnected() will be invoked on the
  socket after the socket buffer lock is dropped.
- A new API is provided for setting and clearing socket upcalls.  The
  API consists of soupcall_set() and soupcall_clear().
- To simplify locking, each socket buffer now has a separate upcall.
- When a socket upcall returns SU_ISCONNECTED, the upcall is cleared from
  the receive socket buffer automatically.  Note that a SO_SND upcall
  should never return SU_ISCONNECTED.
- All this means that accept filters should now return SU_ISCONNECTED
  instead of calling soisconnected() directly.  They also no longer need
  to explicitly clear the upcall on the new socket.
- The HTTP accept filter still uses soupcall_set() to manage its internal
  state machine, but other accept filters no longer have any explicit
  knowlege of socket upcall internals aside from their return value.
- The various RPC client upcalls currently drop the socket buffer lock
  while invoking soreceive() as a temporary band-aid.  The plan for
  the future is to add a new flag to allow soreceive() to be called with
  the socket buffer locked.
- The AIO callback for socket I/O is now also invoked with the socket
  buffer locked.  Previously sowakeup() would drop the socket buffer
  lock only to call aio_swake() which immediately re-acquired the socket
  buffer lock for the duration of the function call.

Discussed with:	rwatson, rmacklem

Revision 1.17.8.1 / (download) - annotate - [select for diffs], Wed Apr 15 03:14:26 2009 UTC (2 months, 2 weeks ago) by kensmith
Branch: RELENG_7_2
CVS Tags: RELENG_7_2_0_RELEASE
Changes since 1.17: +0 -0 lines
Diff to previous 1.17 (colored) next main 1.18 (colored) 

SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)

Revision 1.17.6.1 / (download) - annotate - [select for diffs], Tue Nov 25 02:59:29 2008 UTC (7 months, 1 week ago) by kensmith
Branch: RELENG_7_1
CVS Tags: RELENG_7_1_0_RELEASE
Changes since 1.17: +0 -0 lines
Diff to previous 1.17 (colored) next main 1.18 (colored) 

SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)

Revision 1.16.12.1 / (download) - annotate - [select for diffs], Thu Oct 2 02:57:24 2008 UTC (9 months ago) by kensmith
Branch: RELENG_6_4
CVS Tags: RELENG_6_4_0_RELEASE
Changes since 1.16: +0 -0 lines
Diff to previous 1.16 (colored) next main 1.17 (colored) 

SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)

Revision 1.17 / (download) - annotate - [select for diffs], Sun Oct 7 20:44:22 2007 UTC (20 months, 3 weeks ago) by silby
Branch: MAIN
CVS Tags: RELENG_7_BP, RELENG_7_2_BP, RELENG_7_1_BP, RELENG_7_0_BP, RELENG_7_0_0_RELEASE, RELENG_7_0, RELENG_7
Branch point for: RELENG_7_2, RELENG_7_1
Changes since 1.16: +3 -2 lines
Diff to previous 1.16 (colored) 

Add FBSDID to all files in netinet so that people can more
easily include file version information in bug reports.

Approved by:	re (kensmith)

Revision 1.15.2.1 / (download) - annotate - [select for diffs], Mon Jan 31 23:26:34 2005 UTC (4 years, 5 months ago) by imp
Branch: RELENG_5
CVS Tags: RELENG_5_5_BP, RELENG_5_5_0_RELEASE, RELENG_5_5, RELENG_5_4_BP, RELENG_5_4_0_RELEASE, RELENG_5_4
Changes since 1.15: +1 -1 lines
Diff to previous 1.15 (colored) next main 1.16 (colored) 

MFC: /*- and related license changes

Revision 1.16 / (download) - annotate - [select for diffs], Fri Jan 7 01:45:44 2005 UTC (4 years, 5 months ago) by imp
Branch: MAIN
CVS Tags: RELENG_6_BP, RELENG_6_4_BP, RELENG_6_3_BP, RELENG_6_3_0_RELEASE, RELENG_6_3, RELENG_6_2_BP, RELENG_6_2_0_RELEASE, RELENG_6_2, RELENG_6_1_BP, RELENG_6_1_0_RELEASE, RELENG_6_1, RELENG_6_0_BP, RELENG_6_0_0_RELEASE, RELENG_6_0, RELENG_6
Branch point for: RELENG_6_4
Changes since 1.15: +1 -1 lines
Diff to previous 1.15 (colored) 

/* -> /*- for license, minor formatting changes

Revision 1.15 / (download) - annotate - [select for diffs], Mon Jun 14 18:16:21 2004 UTC (5 years ago) by rwatson
Branch: MAIN
CVS Tags: RELENG_5_BP, RELENG_5_3_BP, RELENG_5_3_0_RELEASE, RELENG_5_3
Branch point for: RELENG_5
Changes since 1.14: +3 -3 lines
Diff to previous 1.14 (colored) 

The socket field so_state is used to hold a variety of socket related
flags relating to several aspects of socket functionality.  This change
breaks out several bits relating to send and receive operation into a
new per-socket buffer field, sb_state, in order to facilitate locking.
This is required because, in order to provide more granular locking of
sockets, different state fields have different locking properties.  The
following fields are moved to sb_state:

  SS_CANTRCVMORE            (so_state)
  SS_CANTSENDMORE           (so_state)
  SS_RCVATMARK              (so_state)

Rename respectively to:

  SBS_CANTRCVMORE           (so_rcv.sb_state)
  SBS_CANTSENDMORE          (so_snd.sb_state)
  SBS_RCVATMARK             (so_rcv.sb_state)

This facilitates locking by isolating fields to be located with other
identically locked fields, and permits greater granularity in socket
locking by avoiding storing fields with different locking semantics in
the same short (avoiding locking conflicts).  In the future, we may
wish to coallesce sb_state and sb_flags; for the time being I leave
them separate and there is no additional memory overhead due to the
packing/alignment of shorts in the socket buffer structure.

Revision 1.14 / (download) - annotate - [select for diffs], Sun May 30 20:23:30 2004 UTC (5 years, 1 month ago) by phk
Branch: MAIN
Changes since 1.13: +1 -0 lines
Diff to previous 1.13 (colored) 

add missing #include <sys/module.h>

Revision 1.13 / (download) - annotate - [select for diffs], Tue Jun 18 07:42:02 2002 UTC (7 years ago) by tanimura
Branch: MAIN
CVS Tags: RELENG_5_2_BP, RELENG_5_2_1_RELEASE, RELENG_5_2_0_RELEASE, RELENG_5_2, RELENG_5_1_BP, RELENG_5_1_0_RELEASE, RELENG_5_1, RELENG_5_0_BP, RELENG_5_0_0_RELEASE, RELENG_5_0
Changes since 1.12: +3 -3 lines
Diff to previous 1.12 (colored) 

Remove so*_locked(), which were backed out by mistake.

Revision 1.12 / (download) - annotate - [select for diffs], Fri May 31 11:52:32 2002 UTC (7 years, 1 month ago) by tanimura
Branch: MAIN
Changes since 1.11: +6 -25 lines
Diff to previous 1.11 (colored) 

Back out my lats commit of locking down a socket, it conflicts with hsu's work.

Requested by:	hsu

Revision 1.11 / (download) - annotate - [select for diffs], Mon May 20 05:41:05 2002 UTC (7 years, 1 month ago) by tanimura
Branch: MAIN
Changes since 1.10: +25 -6 lines
Diff to previous 1.10 (colored) 

Lock down a socket, milestone 1.

o Add a mutex (sb_mtx) to struct sockbuf. This protects the data in a
  socket buffer. The mutex in the receive buffer also protects the data
  in struct socket.

o Determine the lock strategy for each members in struct socket.

o Lock down the following members:

  - so_count
  - so_options
  - so_linger
  - so_state

o Remove *_locked() socket APIs.  Make the following socket APIs
  touching the members above now require a locked socket:

 - sodisconnect()
 - soisconnected()
 - soisconnecting()
 - soisdisconnected()
 - soisdisconnecting()
 - sofree()
 - soref()
 - sorele()
 - sorwakeup()
 - sotryfree()
 - sowakeup()
 - sowwakeup()

Reviewed by:	alfred

Revision 1.10 / (download) - annotate - [select for diffs], Wed May 1 20:44:45 2002 UTC (7 years, 2 months ago) by alfred
Branch: MAIN
Changes since 1.9: +0 -8 lines
Diff to previous 1.9 (colored) 

Redo the sigio locking.

Turn the sigio sx into a mutex.

Sigio lock is really only needed to protect interrupts from dereferencing
the sigio pointer in an object when the sigio itself is being destroyed.

In order to do this in the most unintrusive manner change pgsigio's
sigio * argument into a **, that way we can lock internally to the
function.

Revision 1.1.2.4 / (download) - annotate - [select for diffs], Wed May 1 08:34:37 2002 UTC (7 years, 2 months ago) by alfred
Branch: RELENG_4
CVS Tags: RELENG_4_9_BP, RELENG_4_9_0_RELEASE, RELENG_4_9, RELENG_4_8_BP, RELENG_4_8_0_RELEASE, RELENG_4_8, RELENG_4_7_BP, RELENG_4_7_0_RELEASE, RELENG_4_7, RELENG_4_6_BP, RELENG_4_6_2_RELEASE, RELENG_4_6_1_RELEASE, RELENG_4_6_0_RELEASE, RELENG_4_6, RELENG_4_11_BP, RELENG_4_11_0_RELEASE, RELENG_4_11, RELENG_4_10_BP, RELENG_4_10_0_RELEASE, RELENG_4_10
Changes since 1.1.2.3: +5 -1 lines
Diff to previous 1.1.2.3 (colored) next main 1.2 (colored) 

MFC: 1.9 (fix bad string handling)

Revision 1.9 / (download) - annotate - [select for diffs], Wed May 1 08:29:41 2002 UTC (7 years, 2 months ago) by alfred
Branch: MAIN
Changes since 1.8: +4 -0 lines
Diff to previous 1.8 (colored) 

Fix some edge cases where bad string handling could occur.

Submitted by: ps

Revision 1.8 / (download) - annotate - [select for diffs], Wed May 1 08:08:24 2002 UTC (7 years, 2 months ago) by alfred
Branch: MAIN
Changes since 1.7: +46 -37 lines
Diff to previous 1.7 (colored) 

cleanup:
fix line wraps, add some comments, fix macro definitions, fix for(;;) loops.

Revision 1.7 / (download) - annotate - [select for diffs], Tue Apr 30 01:54:52 2002 UTC (7 years, 2 months ago) by tanimura
Branch: MAIN
Changes since 1.6: +4 -1 lines
Diff to previous 1.6 (colored) 

Revert the change of #includes in sys/filedesc.h and sys/socketvar.h.

Requested by:	bde

Since locking sigio_lock is usually followed by calling pgsigio(),
move the declaration of sigio_lock and the definitions of SIGIO_*() to
sys/signalvar.h.

While I am here, sort include files alphabetically, where possible.

Revision 1.6 / (download) - annotate - [select for diffs], Sat Apr 27 08:24:28 2002 UTC (7 years, 2 months ago) by tanimura
Branch: MAIN
Changes since 1.5: +10 -4 lines
Diff to previous 1.5 (colored) 

Add a global sx sigio_lock to protect the pointer to the sigio object
of a socket.  This avoids lock order reversal caused by locking a
process in pgsigio().

sowakeup() and the callers of it (sowwakeup, soisconnected, etc.) now
require sigio_lock to be locked.  Provide sowwakeup_locked(),
soisconnected_locked(), and so on in case where we have to modify a
socket and wake up a process atomically.

Revision 1.1.2.3 / (download) - annotate - [select for diffs], Wed Jan 3 19:52:37 2001 UTC (8 years, 6 months ago) by alfred
Branch: RELENG_4
CVS Tags: RELENG_4_5_BP, RELENG_4_5_0_RELEASE, RELENG_4_5, RELENG_4_4_BP, RELENG_4_4_0_RELEASE, RELENG_4_4, RELENG_4_3_BP, RELENG_4_3_0_RELEASE, RELENG_4_3
Changes since 1.1.2.2: +2 -2 lines
Diff to previous 1.1.2.2 (colored) 

MFC: fix for disconnected sockets

Revision 1.5 / (download) - annotate - [select for diffs], Wed Jan 3 19:50:23 2001 UTC (8 years, 6 months ago) by alfred
Branch: MAIN
CVS Tags: KSE_PRE_MILESTONE_2, KSE_MILESTONE_2
Changes since 1.4: +2 -2 lines
Diff to previous 1.4 (colored) 

Fix incorrect logic wouldn't disconnect incomming connections that had been
disconnected because they were not full.

Submitted by: David Filo

Revision 1.4 / (download) - annotate - [select for diffs], Sun Oct 29 13:57:08 2000 UTC (8 years, 8 months ago) by phk
Branch: MAIN
Changes since 1.3: +1 -2 lines
Diff to previous 1.3 (colored) 

Remove unneeded #include <sys/proc.h> lines.

Revision 1.3 / (download) - annotate - [select for diffs], Sat Oct 7 23:15:17 2000 UTC (8 years, 8 months ago) by alfred
Branch: MAIN
Changes since 1.2: +1 -13 lines
Diff to previous 1.2 (colored) 

Remove headers not needed.

Pointed out by: phk

Revision 1.1.2.2 / (download) - annotate - [select for diffs], Wed Sep 20 21:19:22 2000 UTC (8 years, 9 months ago) by ps
Branch: RELENG_4
CVS Tags: RELENG_4_2_0_RELEASE, RELENG_4_1_1_RELEASE
Changes since 1.1.2.1: +258 -82 lines
Diff to previous 1.1.2.1 (colored) 

MFC:
A near complete re-write of the accf_http filter:
    1) Parse check if the request is HTTP/1.0 or HTTP/1.1 if not dump
       to the application.
       Because of the performance implications of this there is a sysctl
       'net.inet.accf.http.parsehttpversion' that when set to non-zero
       parses the HTTP version.
       The default is to parse the version.
    2) Check if a socket has filled and dump to the listener
    3) optimize the way that mbuf boundries are handled using some voodoo
    4) even though you'd expect accept filters to only be used on TCP
       connections that don't use m_nextpkt I've fixed the accept filter
       for socket connections that use this.

Revision 1.2 / (download) - annotate - [select for diffs], Wed Sep 6 18:49:11 2000 UTC (8 years, 9 months ago) by alfred
Branch: MAIN
CVS Tags: PRE_SMPNG
Changes since 1.1: +258 -82 lines
Diff to previous 1.1 (colored) 

Accept filter maintainance

Update copyrights.

Introduce a new sysctl node:
  net.inet.accf

Although acceptfilters need refcounting to be properly (safely) unloaded
as a temporary hack allow them to be unloaded if the sysctl
net.inet.accf.unloadable is set, this is really for developers who want
to work on thier own filters.

A near complete re-write of the accf_http filter:
  1) Parse check if the request is HTTP/1.0 or HTTP/1.1 if not dump
     to the application.
     Because of the performance implications of this there is a sysctl
     'net.inet.accf.http.parsehttpversion' that when set to non-zero
     parses the HTTP version.
     The default is to parse the version.
  2) Check if a socket has filled and dump to the listener
  3) optimize the way that mbuf boundries are handled using some voodoo
  4) even though you'd expect accept filters to only be used on TCP
     connections that don't use m_nextpkt I've fixed the accept filter
     for socket connections that use this.

This rewrite of accf_http should allow someone to use them and maintain
full HTTP compliance as long as net.inet.accf.http.parsehttpversion is
set.

Revision 1.1.2.1 / (download) - annotate - [select for diffs], Fri Jul 28 04:03:48 2000 UTC (8 years, 11 months ago) by alfred
Branch: RELENG_4
Changes since 1.1: +1 -1 lines
Diff to previous 1.1 (colored) 

MFC: accept_filters

Revision 1.1 / (download) - annotate - [select for diffs], Tue Jun 20 01:09:23 2000 UTC (9 years ago) by alfred
Branch: MAIN
Branch point for: RELENG_4 

return of the accept filter part II

accept filters are now loadable as well as able to be compiled into
the kernel.

two accept filters are provided, one that returns sockets when data
arrives the other when an http request is completed (doesn't work
with 0.9 requests)

Reviewed by: jmg

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.


www@jp.FreeBSD.org
2002/09/30 21:02:05