o2on svn commit
o2on-****@lists*****
2008年 4月 27日 (日) 23:36:55 JST
Revision: 81
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=o2on&view=rev&rev=81
Author: k-uehara
Date: 2008-04-27 23:36:55 +0900 (Sun, 27 Apr 2008)
Log Message:
-----------
MERGE: trunkより rev48, rev61
Revision Links:
--------------
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=o2on&view=rev&rev=48
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=o2on&view=rev&rev=61
Modified Paths:
--------------
branches/BRANCH_0043/o2on/src.o2on/main.cpp
branches/BRANCH_0043/o2on/src.o2on/upnp_description.h
Modified: branches/BRANCH_0043/o2on/src.o2on/main.cpp
===================================================================
--- branches/BRANCH_0043/o2on/src.o2on/main.cpp 2008-04-23 03:10:57 UTC (rev 80)
+++ branches/BRANCH_0043/o2on/src.o2on/main.cpp 2008-04-27 14:36:55 UTC (rev 81)
@@ -254,7 +254,7 @@
//bench();
//return (0);
- if (FindWindow(_T(CLASS_NAME), NULL))
+ if (!O2DEBUG && FindWindow(_T(CLASS_NAME), NULL))
return (0);
instance = inst;
Modified: branches/BRANCH_0043/o2on/src.o2on/upnp_description.h
===================================================================
--- branches/BRANCH_0043/o2on/src.o2on/upnp_description.h 2008-04-23 03:10:57 UTC (rev 80)
+++ branches/BRANCH_0043/o2on/src.o2on/upnp_description.h 2008-04-27 14:36:55 UTC (rev 81)
@@ -684,6 +684,12 @@
if (cur_argument && cur_argument->direction != "out")
cur_argument = NULL;
}
+ else if(wcsncmp(qname, L"NewExternalIPAddress",20) == 0){
+ cur_action = service->getAction("GetExternalIPAddress");
+ if(cur_action)
+ cur_argument = cur_action->getArgument("NewExternalIPAddress");
+ cur_action = NULL;
+ }
}
void endElement(const XMLCh* const uri