Merge tag 'upstream/3.3.3'

[debian/amanda] / common-src / stream.h

diff --git a/common-src/stream.h b/common-src/stream.h
index 22538287741829f657c59008a7da1f60c33cc51f..ed8f0068ba10672a92fa9a6a556b3c3ea67fcb50 100644 (file)
--- a/common-src/stream.h
+++ b/common-src/stream.h
@@ -1,6 +1,7 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
  * Copyright (c) 1991-1998 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
  * All Rights Reserved.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -25,7 +26,7 @@
  *                        University of Maryland at College Park
  */
 /*
- * $Id: stream.h,v 1.4.2.1.4.3 2001/08/14 22:20:57 jrjackson Exp $
+ * $Id: stream.h,v 1.12 2006/06/01 14:44:05 martinea Exp $
  *
  * interface to stream module
  */
@@ -34,24 +35,23 @@
 
 #include "amanda.h"
 
-/* Note: This must be kept in sync with the DATABUF_SIZE defined in
- * client-src/sendbackup-krb4.c, or kerberos encryption won't work...
- *     - Chris Ross (cross@uu.net)  4-Jun-1998
- */
 #define NETWORK_BLOCK_BYTES    DISK_BLOCK_BYTES
 #define STREAM_BUFSIZE         (NETWORK_BLOCK_BYTES * 2)
 
-int stream_server P((int *port, int sendsize, int recvsize));
-int stream_accept P((int sock, int timeout, int sendsize, int recvsize));
-int stream_client_privileged P((char *hostname,
-                               int port,
-                               int sendsize,
-                               int recvsize,
-                               int *localport));
-int stream_client P((char *hostname,
-                    int port,
-                    int sendsize,
-                    int recvsize,
-                    int *localport));
+int stream_server(int family, in_port_t *port, size_t sendsize,
+                 size_t recvsize, int priv);
+int stream_accept(int sock, int timeout, size_t sendsize, size_t recvsize);
+int stream_client_privileged(const char *hostname,
+                               in_port_t port,
+                               size_t sendsize,
+                               size_t recvsize,
+                               in_port_t *localport,
+                               int nonblock);
+int stream_client(const char *hostname,
+                    in_port_t port,
+                    size_t sendsize,
+                    size_t recvsize,
+                    in_port_t *localport,
+                    int nonblock);
 
 #endif