﻿#!/usr/bin/env python
# -*- coding: utf-8 -*-

# Copyright (c) 2014 clowwindy
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

import time
import os
import socket
import struct
import re
import logging
from shadowsocks import common
from shadowsocks import lru_cache
from shadowsocks import eventloop
import server_pool
import Config

class ServerMgr(object):

    def __init__(self):
        self._loop = None
        self._request_id = 1
        self._hosts = {}
        self._hostname_status = {}
        self._hostname_to_cb = {}
        self._cb_to_hostname = {}
        self._last_time = time.time()
        self._sock = None
        self._servers = None

    def add_to_loop(self, loop):
        if self._loop:
            raise Exception('already add to loop')
        self._loop = loop
        # TODO when dns server is IPv6
        self._sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM,
                                   socket.SOL_UDP)
        self._sock.bind((Config.MANAGE_BIND_IP, Config.MANAGE_PORT))
        self._sock.setblocking(False)
        loop.add(self._sock, eventloop.POLL_IN)
        loop.add_handler(self.handle_events)

    def _handle_data(self, sock):
        data, addr = sock.recvfrom(128)
        #manage pwd:port:passwd:action
        args = data.split(':')
        if len(args) < 4:
            return
        if args[0] == Config.MANAGE_PASS:
            if args[3] == '0':
                server_pool.ServerPool.get_instance().cb_del_server(args[1])
            elif args[3] == '1':
                server_pool.ServerPool.get_instance().new_server(args[1], args[2])

    def handle_events(self, events):
        for sock, fd, event in events:
            if sock != self._sock:
                continue
            if event & eventloop.POLL_ERR:
                logging.error('mgr socket err')
                self._loop.remove(self._sock)
                self._sock.close()
                # TODO when dns server is IPv6
                self._sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM,
                                           socket.SOL_UDP)
                self._sock.setblocking(False)
                self._loop.add(self._sock, eventloop.POLL_IN)
            else:
                self._handle_data(sock)
            break

    def close(self):
        if self._sock:
            self._sock.close()
            self._sock = None


def test():
    pass

if __name__ == '__main__':
    test()

@@ -2115,53 +2115,14 @@
 L_IN
-)%0A        loop.add_handler(self.handle_events
+, self
 )%0A%0A 
@@ -2607,61 +2607,23 @@
 elf,
- events):%0A        for
  sock,
- fd,
  event
- in events:%0A    
+):%0A
     
@@ -2665,25 +2665,15 @@
     
-    continue%0A    
+return%0A
     
@@ -2719,20 +2719,16 @@
         
-  
-  
 logging.
@@ -2751,20 +2751,16 @@
 t err')%0A
-    
         
@@ -2797,36 +2797,32 @@
 ck)%0A            
-    
 self._sock.close
@@ -2832,28 +2832,24 @@
             
-  
-  
 # TODO when 
@@ -2863,28 +2863,24 @@
 ver is IPv6%0A
-    
             
@@ -2972,36 +2972,32 @@
                 
-    
 socket.SOL_UDP)%0A
@@ -3000,36 +3000,32 @@
 DP)%0A            
-  
-  
 self._sock.setbl
@@ -3034,28 +3034,24 @@
 king(False)%0A
-    
             
@@ -3094,16 +3094,22 @@
 .POLL_IN
+, self
 )%0A      
@@ -3114,22 +3114,14 @@
     
-    
 else:%0A
-    
     
@@ -3156,31 +3156,13 @@
 ck)%0A
+%0A
     
-        break%0A%0A    
 def 
@@ -3181,24 +3181,97 @@
 %0A        if 
+self._sock:%0A            if self._loop:%0A                self._loop.remove(
 self._sock:%0A
@@ -3260,33 +3260,33 @@
 emove(self._sock
-:
+)
 %0A            sel

fix asyncmgr.py