diff --git a/scapy/dadict.py b/scapy/dadict.py index 8ab314aef9429071ab3597deb180af383dafa5c3..c799b87c967d46d3f55062ac8a7d14a4af9354e7 100644 --- a/scapy/dadict.py +++ b/scapy/dadict.py @@ -25,7 +25,7 @@ class DADict_Exception(Scapy_Exception): class DADict: def __init__(self, _name="DADict", **kargs): self._name=_name - self._update(kargs) + self.update(kargs) def fixname(self,val): return fixname(val) def __contains__(self, val): @@ -56,7 +56,7 @@ class DADict: return False return True - def _update(self, *args, **kwargs): + def update(self, *args, **kwargs): for k, v in dict(*args, **kwargs).iteritems(): self[k] = v diff --git a/scapy/modules/voip.py b/scapy/modules/voip.py index 53036a7899b7782e9c1fceee47377da6b652aeed..de1ce5f25b3dbeac55e7944932b3d4e7daf46950 100644 --- a/scapy/modules/voip.py +++ b/scapy/modules/voip.py @@ -24,9 +24,6 @@ sox_base = "sox -t .ul %s - -t ossdsp /dev/dsp" if WINDOWS: if conf.prog.sox is None: raise OSError("Sox must be installed to play VoIP packets") - finally: - if p_test: - p_test.terminate() sox_base = "\"" + conf.prog.sox + "\" -t .ul %s - -t waveaudio" def _merge_sound_bytes(x,y,sample_size=2):