Rev 751 | Rev 1398 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed
| Rev 751 | Rev 752 | ||
|---|---|---|---|
| Line 260... | Line 260... | ||
| 260 | 260 | ||
| 261 | if not self.INTERFACE_TYPES.has_key(type): |
261 | if not self.INTERFACE_TYPES.has_key(type): |
| 262 | log.debug('addInterface called with invalid interface type') |
262 | log.debug('addInterface called with invalid interface type') |
| 263 | return False |
263 | return False |
| 264 | 264 | ||
| - | 265 | if cfg is None: |
|
| 265 | cfg = self.INTERFACE_TYPES[type].DEFAULT_CONFIG |
266 | cfg = self.INTERFACE_TYPES[type].DEFAULT_CONFIG |
| - | 267 | ||
| 266 | nodeIf = self.INTERFACE_TYPES[type](self.pktHandler, cfg) |
268 | nodeIf = self.INTERFACE_TYPES[type](self.pktHandler, cfg) |
| 267 | self.nodeInterfaces.append(nodeIf) |
269 | self.nodeInterfaces.append(nodeIf) |
| 268 | return True |
270 | return True |
| 269 | 271 | ||
| 270 | def remInterface(self, name): |
272 | def remInterface(self, name): |
| 271 | pass |
273 | pass |
| 272 | 274 | ||
| 273 | def addServerDaemon(self, type, cfg = None): |
275 | def addServerDaemon(self, type, cfg = None): |
| 274 | 276 | ||
| 275 | if not self.SERVER_TYPES.has_key(type): |
277 | if not self.SERVER_TYPES.has_key(type): |
| 276 | log.debug('addServerDaemon called with invalid daemon type') |
278 | log.debug('addServerDaemon called with invalid daemon type') |
| 277 | return False |
279 | return False |
| 278 | 280 | ||
| - | 281 | if cfg is None: |
|
| - | 282 | cfg = self.SERVER_TYPES[type].DEFAULT_CONFIG |
|
| - | 283 | ||
| 279 | serverd = self.SERVER_TYPES[type]() # actung! |
284 | serverd = self.SERVER_TYPES[type](self.pktHandler, cfg) # actung! |
| - | 285 | self.serverDaemons.append(serverd) |
|
| 280 | return True |
286 | return True |
| 281 | 287 | ||
| 282 | def remServerDaemon(self, name): |
288 | def remServerDaemon(self, name): |
| 283 | pass |
289 | pass |
| 284 | 290 | ||