--- rtpgenerator.py	2004-06-05 00:02:08.000000000 +0200
+++ rtpgenerator_nh.py	2004-06-30 18:05:48.000000000 +0200
@@ -50,10 +50,10 @@
         self.local = "remote"
         self.session = session or ("%s:%s" % self.addr)
         self.mode = mode
-        command = "%(mode)s %(session)s %(ip)s:%(port)d %(ip)s dummy remote dummy remote dummy-agent info=from:test@test.com,to:test@test.com\n" % self.__dict__
+        command = "%(mode)s %(session)s %(ip)s %(port)d from_tag to_tag\n" % self.__dict__
         proxy = self.sendCommand(command).split()
         if proxy:
-            self.proxy = (proxy[0], int(proxy[1]))
+            self.proxy = (self.ip, int(proxy[0]))
         else:
             raise GeneratorError, "No answer from mediaproxy"
 
@@ -71,7 +71,7 @@
             s.close()
     
     def end(self):
-        self.sendCommand("delete %s\n" % self.session)
+        self.sendCommand("D %s from_tag\n" % self.session)
 
     def writable(self):
         return 1
@@ -163,8 +163,8 @@
     if options.rate<0 or options.rate>512:
         print "Rate must be between 0 and 512 kbps"
         sys.exit(1)
-    if options.count<1 or options.count>30:
-        print "Count must be between 1 and 30"
+    if options.count<1 or options.count>3000:
+        print "Count must be between 1 and 3000"
         sys.exit(1)
     if options.g711:
         dataSize = 172
@@ -185,8 +185,8 @@
     senders = []
     try:
         for i in range(options.count):
-            sender = RTPGenerator('request')
-            receiver = RTPGenerator('lookup', sender.session)
+            sender = RTPGenerator('U')
+            receiver = RTPGenerator('L', sender.session)
             senders.append(sender)
         loop()
     except GeneratorError, why: