~mdw
/
hippotat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipif: set interface names
[hippotat]
/
hippotatlib
/
__init__.py
diff --git
a/hippotatlib/__init__.py
b/hippotatlib/__init__.py
index
ab404fa
..
2a2a8ee
100644
(file)
--- a/
hippotatlib/__init__.py
+++ b/
hippotatlib/__init__.py
@@
-136,15
+136,15
@@
max_batch_up = 4000
http_retry = 5
port = 80
vroutes = ''
http_retry = 5
port = 80
vroutes = ''
+ifname_client = hippo%%d
+ifname_server = shippo%%d
#[server] or [<client>] overrides
#[server] or [<client>] overrides
-ipif = userv root ipif %(local)s,%(peer)s,%(mtu)s,slip %(rnets)s
+ipif = userv root ipif %(local)s,%(peer)s,%(mtu)s,slip
,%(ifname)s
%(rnets)s
# relating to virtual network
mtu = 1500
# relating to virtual network
mtu = 1500
-[SERVER]
-server = SERVER
# addrs = 127.0.0.1 ::1
# url
# addrs = 127.0.0.1 ::1
# url
@@
-449,12
+449,15
@@
def cfg_process_saddrs(c, ss):
self._endpointfactory = twisted.internet.endpoints.TCP6ServerEndpoint
self._inurl = b'[%s]'
def make_endpoint(self):
self._endpointfactory = twisted.internet.endpoints.TCP6ServerEndpoint
self._inurl = b'[%s]'
def make_endpoint(self):
- return self._endpointfactory(reactor, self.port, self.addr)
+ return self._endpointfactory(reactor, self.port,
+ interface= '%s' % self.addr)
def url(self):
url = b'http://' + (self._inurl % str(self.addr).encode('ascii'))
if self.port != 80: url += b':%d' % self.port
url += b'/'
return url
def url(self):
url = b'http://' + (self._inurl % str(self.addr).encode('ascii'))
if self.port != 80: url += b':%d' % self.port
url += b'/'
return url
+ def __repr__(self):
+ return 'ServerAddr'+repr((self.port,self.addr))
c.port = cfg.getint(ss,'port')
c.saddrs = [ ]
c.port = cfg.getint(ss,'port')
c.saddrs = [ ]
@@
-522,6
+525,10
@@
def cfg_process_ipif(c, sections, varmap):
#---------- startup ----------
#---------- startup ----------
+def log_debug_config(m):
+ if not DBG.CONFIG in debug_set: return
+ print('DBG.CONFIG:', m)
+
def common_startup(process_cfg):
# calls process_cfg(putative_clients, putative_servers)
def common_startup(process_cfg):
# calls process_cfg(putative_clients, putative_servers)
@@
-533,7
+540,7
@@
def common_startup(process_cfg):
def readconfig(pathname, mandatory=True):
def log(m, p=pathname):
if not DBG.CONFIG in debug_set: return
def readconfig(pathname, mandatory=True):
def log(m, p=pathname):
if not DBG.CONFIG in debug_set: return
-
print('DBG.CONFIG:
%s: %s' % (m, pathname))
+
log_debug_config('
%s: %s' % (m, pathname))
try:
files = os.listdir(pathname)
try:
files = os.listdir(pathname)
@@
-692,3
+699,4
@@
def common_run():
log_debug(DBG.INIT, 'entering reactor')
if not _crashing: reactor.run()
print('ENDED', file=sys.stderr)
log_debug(DBG.INIT, 'entering reactor')
if not _crashing: reactor.run()
print('ENDED', file=sys.stderr)
+ sys.exit(16)