Merge changes from CUPS 1.4svn-r7874.

[thirdparty/cups.git] / scheduler / network.h

diff --git a/scheduler/network.h b/scheduler/network.h
index a04b539fdf25f160f5cd9ba729a8ce0e67b310e7..dd38e211481fa2ae14eea13c46e372aa468979ec 100644 (file)
--- a/scheduler/network.h
+++ b/scheduler/network.h
@@ -1,26 +1,17 @@
 /*
- * "$Id: network.h 4719 2005-09-28 21:12:44Z mike $"
+ * "$Id: network.h 6649 2007-07-11 21:46:42Z mike $"
  *
  *   Network interface definitions for the Common UNIX Printing System
  *   (CUPS) scheduler.
  *
- *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -29,15 +20,13 @@
 
 typedef struct cupsd_netif_s           /**** Network interface data ****/
 {
-  struct cupsd_netif_s *next;          /* Next interface in list */
-  char                 name[32],       /* Network interface name */
-                       hostname[HTTP_MAX_HOST];
-                                       /* Hostname associated with interface */
   int                  is_local,       /* Local (not point-to-point) interface? */
                        port;           /* Listen port */
   http_addr_t          address,        /* Network address */
                        mask,           /* Network mask */
                        broadcast;      /* Broadcast address */
+  char                 name[32],       /* Network interface name */
+                       hostname[1];    /* Hostname associated with interface */
 } cupsd_netif_t;
 
 
@@ -45,20 +34,19 @@ typedef struct cupsd_netif_s                /**** Network interface data ****/
  * Globals...
  */
 
-VAR time_t             NetIFTime       VALUE(0);
-                                       /* Network interface list time */
-VAR cupsd_netif_t      *NetIFList      VALUE(NULL);
-                                       /* List of network interfaces */
+VAR int                        NetIFUpdate     VALUE(1);
+                                       /* Network interface list needs updating */
+VAR cups_array_t       *NetIFList      VALUE(NULL);
+                                       /* Array of network interfaces */
 
 /*
  * Prototypes...
  */
 
 extern cupsd_netif_t   *cupsdNetIFFind(const char *name);
-extern void            cupsdNetIFFree(void);
 extern void            cupsdNetIFUpdate(void);
 
 
 /*
- * End of "$Id: network.h 4719 2005-09-28 21:12:44Z mike $".
+ * End of "$Id: network.h 6649 2007-07-11 21:46:42Z mike $".
  */