Changeset 351

Timestamp:

06/04/08 00:25:47 (7 months ago)

Author:

bwilson

Message:

all attack markings made the same, fix events for federation

Location:

code/trunk

Files:

• backend/agents/skaion.py (modified) (1 diff)
• backend/counters.py (modified) (4 diffs)
• backend/daemon.py (modified) (5 diffs)
• backend/emulab.py (modified) (1 diff)
• backend/pubsub.py (modified) (1 diff)
• ccode/flooder.c (modified) (1 diff)
• tars.py (modified) (1 diff)

code/trunk/backend/agents/skaion.py

@@ -21 +21 @@
         def handleSTOP(self):
                 if self.name == self.getVar('master'):
-                        run("/usr/local/tg/bin.master/TG_stop.sh -k")
+                        run("/usr/local/tg/bin.master/TG_stop.sh")
 
 

code/trunk/backend/counters.py

@@ -128 +128 @@
 
         def addIncomingAttackCounter(self, intf, handle):
-                run("iptables -t mangle -A PREROUTING  -m mark ! --mark %d -i %s -m dscp --dscp 63" % (handle, intf))
+                run("iptables -t mangle -A PREROUTING  -m mark ! --mark %d -i %s -m dscp --dscp 56" % (handle, intf))
 
         def addOutgoingAttackCounter(self, intf, handle):
-                run("iptables -t mangle -A POSTROUTING -m mark ! --mark %d -o %s -m dscp --dscp 63" % (handle, intf))
+                run("iptables -t mangle -A POSTROUTING -m mark ! --mark %d -o %s -m dscp --dscp 56" % (handle, intf))
 
         def loadCounters(self):
@@ -140 +140 @@
                 # 0   1   2   3    4      5        6           7        8     9    10   11   12    13   
                 # 0   0  all  --  ifin  ifout  0.0.0.0/0   0.0.0.0/0   MARK match !0x4
-                # 0   0  all  --  ifin  ifout  0.0.0.0/0   0.0.0.0/0   MARK match !0x5 DSCP match 0x3f
+                # 0   0  all  --  ifin  ifout  0.0.0.0/0   0.0.0.0/0   MARK match !0x5 DSCP match 0x38
 
                 for line in output.splitlines():
@@ -262 +262 @@
 class CounterThread(threading.Thread):
 
-        def __init__(self, txq, hostname, iflist, controlip):
+        def __init__(self, txq, hostname, iflist):
                 threading.Thread.__init__(self)
                 self.queue = txq
-                self.guiip = controlip
 
                 if (sys.platform == 'linux2'):
@@ -300 +299 @@
                                 if (lastsend + 5) < now:
                                         args = base64.b64encode(zlib.compress('|'.join(self.dataqueue), 9))
-                                        self.queue.put(Event(host=self.guiip, type='GUI', event='COUNTERS', args=args))
+                                        self.queue.put(Event(host='control', type='GUI', event='COUNTERS', args=args))
                                         lastsend = now
                                         self.dataqueue = []

code/trunk/backend/daemon.py

@@ -117 +117 @@
                 # Special type that doesn't need an instantiated agent module
                 if (msg.type == 'GUI'):
+                        if self.emulabstate.node != 'control':
+                                return  # If I'm not the control node, I don't care.
+
                         if (msg.event == 'LOG'):
                                 self.logforgui.addMsg(msg.args)
@@ -183 +186 @@
 class LogThread(threading.Thread):
 
-        def __init__(self, txq, filename, mynode, guiip):
+        def __init__(self, txq, filename, mynode):
                 threading.Thread.__init__(self)
                 self.queue = txq
                 self.filename = filename
                 self.mynode = mynode
-                self.guiip = guiip
 
         def run (self):
@@ -208 +210 @@
                                                         continue
 
-                                                self.queue.put(Event(host=self.guiip, type='GUI', event='LOG',
+                                                self.queue.put(Event(host='control', type='GUI', event='LOG',
                                                                                         args=self.mynode+" "+line.strip()))
                                         else:
@@ -262 +264 @@
         pubsub = PubSubSocket(state.controlip, state.eid)
         pubsub.start()
-        pubsub.subscribe({}) # Everything that is for our host
+        if state.node == 'control':
+                pubsub.subscribe({"HOST":"*,control"}) # All generic and control messages
+        else:
+                pubsub.subscribe({"HOST":"*"}) # All generic messages
 
         # Start a processor for received events
@@ -270 +275 @@
         try:
                 # Start threads for sending log messages and reading of counters
-                guiip = socket.gethostbyname("control.%s.%s" % (state.exp, state.proj))
-                LogThread(pubsub, '/local/logs/gui.log', state.node, guiip).start()
+                #guiip = socket.gethostbyname("control.%s.%s" % (state.exp, state.proj))
+                LogThread(pubsub, '/local/logs/gui.log', state.node).start()
                 if state.node != 'control':
-                        counters.CounterThread(pubsub, state.node, state.iflist, guiip).start()
+                        counters.CounterThread(pubsub, state.node, state.iflist).start()
         except:
                 logging.error("Unable to setup GUI log or counter log", exc_info=1)

code/trunk/backend/emulab.py

@@ -50 +50 @@
                 name = inet = mask = mac = ''
 
-                # WinXP image tmcc doesn't seem to write a local copy for us
-                if (sys.platform == 'cygwin'):
-                        iffile = pipeIn('/usr/local/etc/emulab/tmcc ifconfig')
-                else:
-                        iffile = open('/var/emulab/boot/tmcc/ifconfig', 'r')
+                iffile = pipeIn('/usr/local/etc/emulab/tmcc ifconfig')
 
                 # Split into lines

code/trunk/backend/pubsub.py

@@ -461 +461 @@
                 sub.addConstraint("EXPT", self.exp)
                 sub.addConstraint("SCHEDULER", 0)
-                sub.addConstraint("HOST", "*,"+self.ip)
                 for (k, v) in pairs.iteritems():
                         sub.addConstraint(k, v)

code/trunk/ccode/flooder.c

@@ -196 +196 @@
         p->protoid = LIBNET_PTAG_INITIALIZER;
         p->interfacename = NULL;
-        p->attack_identifier = (63 << 2);  /* id is 63 but DSCP field is left 6 bits of old TOS field */
+        p->attack_identifier = 0xE0; /* id is ipprecendence 7, tos 0 */
 
         p->ratetype = 0;

code/trunk/tars.py

@@ -94 +94 @@
         dotree('fbsd62')
         dotree('winxp')
+        dotree('skaion')
+elif sys.argv[1] == 'video':
+        tar = MyTarFile.open('/share/seer/seer-videodata.tgz', 'w:gz')
+        tar.addtree('trees/video', '')
+        tar.close()
 else:
         dotree(sys.argv[1])
+