mupnp 0.1 → 0.1.1

data/README

@@ -1,8 +1,13 @@
 = UPnP
+Author:: Dario Meloni (mailto:mellon85@gmail.com)
+License:: LGPL
 
 The gem is based on the work of Thomas Bernard, miniupnp library
 (http://miniupnp.free.fr/). The source code and his license can be
 found in the ext directory.
+There is a little modification in the code. In the original code there was a compile time switch to receive answer only on the UPnP ports. It is sometimes suefull with certains firewall to have it enabled, but it may give some problems with Windows XP. So i have changed it in a run time switch to be passed to upnpDiscover function.
+By default it wants to receive answer on the same port (firewall friendly). If no answer are received from some devices, then maybe a test with them off (microsoft friendly, may get blocked by firewalls).
+
 The windows version will be made as long as
 i have some volounteer that can provide me the precompiled code for
 windows. The library is in the module called MiniUPnP, in it you can
@@ -10,4 +15,4 @@ find all the library functions.
 The module UPnP is a wrapper that simplify the access to the
 underlaying library.
 The interface was automatically built with swig (http://www.swig.org/),
-the interface file is upnp.i
+the interface file is upnp.i

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/rdoctask'
 
 spec = Gem::Specification.new do |s|
     s.name     = "mupnp"
-    s.version  = "0.1"
+    s.version  = "0.1.1"
     s.author   = "Dario Meloni"
     s.email    = "mellon85@gmail.com"
     s.homepage = "http://rubyforge.org/projects/mupnp/"

data/ext/miniupnpc.c

@@ -32,12 +32,6 @@
 #include "minixml.h"
 #include "upnpcommands.h"
 
-/* Uncomment the following to transmit the msearch from the same port
- * as the UPnP multicast port. With WinXP this seems to result in the
- * responses to the msearch being lost, thus if things dont work then
- * comment this out. */
-/* #define TX_FROM_UPNP_PORT */
-
 #ifdef WIN32
 #define PRINT_SOCKET_ERROR(x)    printf("Socket error: %s, %d\n", x, WSAGetLastError());
 #else
@@ -344,7 +338,7 @@ parseMSEARCHReply(const char * reply, int size,
  * It is up to the caller to free the chained list
  * delay is in millisecond (poll) */
 struct UPNPDev * upnpDiscover(int delay, const char * multicastif,
-                              const char * minissdpdsock)
+                              const char * minissdpdsock, int sameport)
 {
 	struct UPNPDev * tmp;
 	struct UPNPDev * devlist = 0;
@@ -397,9 +391,8 @@ struct UPNPDev * upnpDiscover(int delay, const char * multicastif,
     /* reception */
     memset(&sockudp_r, 0, sizeof(struct sockaddr_in));
     sockudp_r.sin_family = AF_INET;
-#ifdef TX_FROM_UPNP_PORT
-    sockudp_r.sin_port = htons(PORT);
-#endif
+    if (sameport) 
+        sockudp_r.sin_port = htons(PORT);
     sockudp_r.sin_addr.s_addr = INADDR_ANY;
     /* emission */
     memset(&sockudp_w, 0, sizeof(struct sockaddr_in));

data/ext/miniupnpc.h

@@ -41,7 +41,7 @@ struct UPNPDev {
  * If multicastif is not NULL, it will be used instead of the default
  * multicast interface for sending SSDP discover packets. */
 LIBSPEC struct UPNPDev * upnpDiscover(int delay, const char * multicastif,
-                                      const char * minissdpdsock);
+                                      const char * minissdpdsock, int sameport);
 /* freeUPNPDevlist()
  * free list returned by upnpDiscover() */
 LIBSPEC void freeUPNPDevlist(struct UPNPDev * devlist);

data/ext/upnp_wrap.c

@@ -2452,6 +2452,7 @@ _wrap_upnpDiscover(int argc, VALUE *argv, VALUE self) {
   int arg1 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
+  int arg4 ;
   struct UPNPDev *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
@@ -2461,10 +2462,12 @@ _wrap_upnpDiscover(int argc, VALUE *argv, VALUE self) {
   int res3 ;
   char *buf3 = 0 ;
   int alloc3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
   VALUE vresult = Qnil;
   
-  if ((argc < 3) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  if ((argc < 4) || (argc > 4)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
   }
   ecode1 = SWIG_AsVal_int(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
@@ -2481,7 +2484,12 @@ _wrap_upnpDiscover(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "upnpDiscover" "', argument " "3"" of type '" "char const *""'");
   }
   arg3 = (char *)(buf3);
-  result = (struct UPNPDev *)upnpDiscover(arg1,(char const *)arg2,(char const *)arg3);
+  ecode4 = SWIG_AsVal_int(argv[3], &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "upnpDiscover" "', argument " "4"" of type '" "int""'");
+  } 
+  arg4 = (int)(val4);
+  result = (struct UPNPDev *)upnpDiscover(arg1,(char const *)arg2,(char const *)arg3,arg4);
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UPNPDev, 0 |  0 );
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);

data/lib/UPnP.rb

@@ -1,9 +1,11 @@
 #! /usr/bin/ruby
-# Author: Dario Meloni <mellon85@gmail.com>
 # This module is a binding to the Thomas Bernard miniupnp library
 # written in C.  It supports the IGD specification and works with IPv4
 # only.  Every exception that comes from inside the library is report as
 # UPnPException while wrong arguments are returned as ArgumentError.
+#
+# Author:: Dario Meloni (mailto:mellon85@gmail.com)
+# License:: LGPL
 
 require 'MiniUPnP'
 include ObjectSpace
@@ -80,7 +82,11 @@ module UPnP
         # on the background to scan the network.  All the other
         # functions are safe to be called in the meanwhile, they will
         # just wait for the scan to end before operating.
-        def initialize(autodiscover=true,max_wait=1000)
+        # The variable sameport if set to true will receive UPnP answers from
+        # the incoming port. It can be usefull with some routers.  Try with
+        # false, and if it fails try again with true if the firewall allows
+        # only UPnP ports.
+        def initialize(autodiscover=true,sameport=true,max_wait=1000)
             if max_wait <= 0 then
                 raise ArgumentError, "Max wait time must be >= 1."
             end
@@ -92,6 +98,9 @@ module UPnP
             # start the discover process at the object initialization.
             # until ruby2, this thread will block the ruby environment
             # for the wait time.
+            
+            @sameport = sameport
+
             if autodiscover then
                 @igd_thread = Thread.new { discoverIGD }
             else
@@ -114,7 +123,9 @@ module UPnP
             if max_wait_time <= 0 then
                 raise ArgumentError, "Max wait time must be >= 1"
             end
-            @list = MiniUPnP.upnpDiscover(max_wait_time,nil,nil)
+            sameport = 0
+            sameport = 1 if @sameport != false
+            @list = MiniUPnP.upnpDiscover(max_wait_time,nil,nil,sameport)
             if @list == nil then
                 raise UPnPException.new,"No UPNP Device Found"
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mupnp
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: 0.1.1
 platform: ruby
 authors: 
 - Dario Meloni
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-01 00:00:00 +02:00
+date: 2008-09-19 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mupnp
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: UPnP Implementation using the Miniupnpc library