ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/filter/UDPReader.java
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filter/UDPReader.java (file contents):
Revision 1.14 by tdb, Sun Jan 28 05:34:38 2001 UTC vs.
Revision 1.25 by tdb, Wed Feb 5 16:43:47 2003 UTC

# Line 1 | Line 1
1 + /*
2 + * i-scream central monitoring system
3 + * http://www.i-scream.org.uk
4 + * Copyright (C) 2000-2002 i-scream
5 + *
6 + * This program is free software; you can redistribute it and/or
7 + * modify it under the terms of the GNU General Public License
8 + * as published by the Free Software Foundation; either version 2
9 + * of the License, or (at your option) any later version.
10 + *
11 + * This program is distributed in the hope that it will be useful,
12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 + * GNU General Public License for more details.
15 + *
16 + * You should have received a copy of the GNU General Public License
17 + * along with this program; if not, write to the Free Software
18 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
19 + */
20 +
21   //---PACKAGE DECLARATION---
22 < package uk.ac.ukc.iscream.filter;
22 > package uk.org.iscream.cms.server.filter;
23  
24   //---IMPORTS---
25   import java.io.*;
26   import java.net.*;
27   import java.util.*;
28 < import uk.ac.ukc.iscream.core.*;
29 < import uk.ac.ukc.iscream.componentmanager.*;
30 < import uk.ac.ukc.iscream.filter.*;
31 < import uk.ac.ukc.iscream.util.*;
28 > import uk.org.iscream.cms.server.core.*;
29 > import uk.org.iscream.cms.server.componentmanager.*;
30 > import uk.org.iscream.cms.server.filter.*;
31 > import uk.org.iscream.cms.util.*;
32  
33   /**
34   * This class contains the main method to be run by
# Line 25 | Line 45 | public class UDPReader extends Thread{
45       * The current CVS revision of this class
46       */
47      public final String REVISION = "$Revision$";
48 <
48 >    
49      /**
50       * The maximum size of a packet
51       */
# Line 42 | Line 62 | public class UDPReader extends Thread{
62       * @param queue The queue which we are using
63       */
64      public UDPReader(int port, Queue queue){
65 +        // set the Thread name
66 +        setName("filter.UDPReader");
67 +        
68          _port = port;
69          _queue = queue;
70 +        _logger.write(toString(), Logger.SYSINIT, "started");
71      }
72  
73   //---PUBLIC METHODS---
# Line 53 | Line 77 | public class UDPReader extends Thread{
77       * over UDP.
78       */
79      public void run() {
80 +        // setup an empty ACL defaulting to ALLOW
81 +        ACL acl = new ACL(ACL.ALLOW);
82          
83          // setup a Datagram socket
84          DatagramSocket socket = null;
85          try {
86 <            socket = new DatagramSocket(_port);
86 >            socket = new ACLDatagramSocket(acl, _port);
87          }
88          catch (BindException e){
89              _logger.write(this.toString(), Logger.FATAL, "Could not start the UDPReader thread on port "+_port+" as this port was already in use.");
# Line 69 | Line 95 | public class UDPReader extends Thread{
95          }
96          
97          _logger.write(this.toString(), Logger.SYSMSG, "UDPReader thread ready and listening for UDP packets on port "+_port);
98 <
98 >        
99          byte[] buf;
100          
101 +        ConfigurationProxy cp = ConfigurationProxy.getInstance();
102 +        String stringACL = "";
103 +        String newStringACL = "";
104 +        
105          // read UDP packets and queue them
106          boolean running = true;
107          while (running){
108 +            // get hold of the ACL in the configuration
109              try {
110 <
111 <                    // receive request and put it in the Queue              
110 >                newStringACL = cp.getProperty("Filter." + FilterMain.NAME, "Filter.UDPACL");
111 >            }
112 >            catch(PropertyNotFoundException e) {
113 >                // if we can't find it, we'll just use a null ACL
114 >                newStringACL = "";
115 >                _logger.write(toString(), Logger.WARNING, "No ACL found for UDPReader, using empty ACL instead: " + e);
116 >            }
117 >            // check to see if the ACL has changed
118 >            if(!newStringACL.equals(stringACL)) {
119 >                _logger.write(toString(), Logger.SYSMSG, "Reloading Access Control List");
120 >                // clear the ACL
121 >                acl.clear();
122 >                // set the default to something sane
123 >                acl.setDefaultMode(ACL.ALLOW);
124 >                // add the new ACL (this may change the default)
125 >                acl.add(newStringACL);
126 >                stringACL = newStringACL;
127 >            }
128 >            try {
129 >                
130 >                // receive request and put it in the Queue              
131                  buf = new byte[packetSizeLimit];
132                  DatagramPacket packet = new DatagramPacket(buf, buf.length);
133                  socket.receive(packet);
# Line 91 | Line 141 | public class UDPReader extends Thread{
141          }
142          socket.close();
143      }
144 <
144 >    
145      /**
146       * Overrides the {@link java.lang.Object#toString() Object.toString()}
147       * method to provide clean logging (every class should have this).
148       *
149 <     * This uses the uk.ac.ukc.iscream.util.NameFormat class
149 >     * This uses the uk.org.iscream.cms.util.NameFormat class
150       * to format the toString()
151       *
152       * @return the name of this class and its CVS revision
# Line 124 | Line 174 | public class UDPReader extends Thread{
174       * be changed to null for utility classes.
175       */
176      private String _name = FilterMain.NAME;
177 <
177 >    
178      /**
179       * This holds a reference to the
180       * system logger that is being used.
# Line 139 | Line 189 | public class UDPReader extends Thread{
189      /**
190       * The Queue object
191       */
192 <    Queue _queue;    
192 >    Queue _queue;
193  
194   //---STATIC ATTRIBUTES---
195  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines