Ticket #2: server.ptc

File server.ptc, 1.8 kB (added by wichert, 3 years ago)

Patch fixing Handle*Packet methods in pyrad.server

Line 
1 diff -ru pyrad-0.8/src/server.py ../pyrad-0.8/src/server.py
2 --- pyrad-0.8/src/server.py     2004-07-25 13:40:22.000000000 +0200
3 +++ ../pyrad-0.8/src/server.py  2005-04-08 16:21:29.000000000 +0200
4 @@ -102,7 +102,7 @@
5                 self.acctfds.append(acctfd)
6        
7  
8 -       def HandleAuthPacket(self, pkt):
9 +       def HandleAuthPacket(self, fd, pkt):
10                 """Authentication packet handler.
11  
12                 This is an empty function that is called when a valid
13 @@ -115,7 +115,7 @@
14                 pass
15  
16  
17 -       def HandleAcctPacket(self, pkt):
18 +       def HandleAcctPacket(self, fd, pkt):
19                 """Accounting packet handler.
20  
21                 This is an empty function that is called when a valid
22 @@ -128,7 +128,7 @@
23                 pass
24  
25  
26 -       def _HandleAuthPacket(self, pkt):
27 +       def _HandleAuthPacket(self, fd, pkt):
28                 """Process a packet received on the authentication port
29  
30                 If this packet should be dropped instead of processed a
31 @@ -146,10 +146,10 @@
32                 if pkt.code!=packet.AccessRequest:
33                         raise PacketError, "Received non-authentication packet on authentication port"
34                
35 -               self.HandleAuthPacket(pkt)
36 +               self.HandleAuthPacket(fd, pkt)
37  
38  
39 -       def _HandleAcctPacket(self, pkt):
40 +       def _HandleAcctPacket(self, fd, pkt):
41                 """Process a packet received on the accounting port
42  
43                 If this packet should be dropped instead of processed a
44 @@ -168,7 +168,7 @@
45                                 packet.AccountingResponse ]:
46                         raise PacketError, "Received non-accounting packet on accounting port"
47  
48 -               self.HandleAcctPacket(pkt)
49 +               self.HandleAcctPacket(fd, pkt)
50        
51  
52         def _GrabPacket(self, pktgen, fd):
53 @@ -232,10 +232,10 @@
54                 """
55                 if fd.fileno() in self._realauthfds:
56                         pkt=self._GrabPacket(lambda data, s=self: s.CreateAuthPacket(packet=data), fd)
57 -                       self._HandleAuthPacket(pkt)
58 +                       self._HandleAuthPacket(fd, pkt)
59                 else:
60                         pkt=self._GrabPacket(lambda data, s=self: s.CreateAcctPacket(packet=data), fd)
61 -                       self._HandleAcctPacket(pkt)
62 +                       self._HandleAcctPacket(fd, pkt)
63  
64  
65
66
67