Projects
Extra
aMule
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 28
View file
aMule.spec
Changed
@@ -1,6 +1,6 @@ Name: aMule Summary: Another eMule file-sharing program -Version: 2.3.1+git20150529.1049 +Version: 2.3.1+git20150609.1135 Release: 0 License: GPL-2.0+ Group: Productivity/Networking/Other
View file
update.diff.xz
Changed
@@ -1,10 +1,10 @@ diff --git a/.svn-revision b/.svn-revision -index ca56113..0c0e885 100644 +index ca56113..c616311 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -10865 -+10871 ++10873 diff --git a/configure b/configure index ae0a1bc..990a088 100755 --- a/configure @@ -64,19 +64,21 @@ if test \${sha} = ${git_sha} ; then echo "rev. \${svn_revision}${modified}" diff --git a/docs/Changelog b/docs/Changelog -index 562606a..bcdf130 100644 +index 562606a..168d809 100644 --- a/docs/Changelog +++ b/docs/Changelog -@@ -16,6 +16,8 @@ Version 2.4.0 - The river knows. +@@ -16,6 +16,10 @@ Version 2.4.0 - The river knows. * Adapt configure to handle subversion repository clones in mercurial and git * Fix bfd detection for systems missing -liberty + * Add support for 'canceled.met' to the fileview tool + * Implemented the missing 'show shared' command in amulecmd ++ * Fix check for a valid locale config entry being done *after* ++ the locale has been set iz0bbz: * Fix WinSock library version detection with MinGW-w64 -@@ -27,6 +29,7 @@ Version 2.4.0 - The river knows. +@@ -27,6 +31,7 @@ Version 2.4.0 - The river knows. Mr Hyde: * Fix "Disable computer's timed standby mode" for MacOS 10.9 Mavericks * Compilation fix on Linux Slackware 64bit and MacOS 10.9.4 @@ -248,6 +250,1075 @@ m_commands.AddCommand(wxT("Reset"), CMD_ID_RESET_LOG, wxTRANSLATE("Reset log."), wxEmptyString, CMD_PARAM_NEVER); +diff --git a/src/UPnPBase.cpp b/src/UPnPBase.cpp +index 5dd4da1..3266b87 100644 +--- a/src/UPnPBase.cpp ++++ b/src/UPnPBase.cpp +@@ -91,47 +91,29 @@ m_key() + m_key = m_protocol + m_port; + } + ++namespace UPnP { + +-const std::string &CUPnPLib::UPNP_ROOT_DEVICE = +- "upnp:rootdevice"; +- +-const std::string &CUPnPLib::UPNP_DEVICE_IGW = +- "urn:schemas-upnp-org:device:InternetGatewayDevice:1"; +-const std::string &CUPnPLib::UPNP_DEVICE_WAN = +- "urn:schemas-upnp-org:device:WANDevice:1"; +-const std::string &CUPnPLib::UPNP_DEVICE_WAN_CONNECTION = +- "urn:schemas-upnp-org:device:WANConnectionDevice:1"; +-const std::string &CUPnPLib::UPNP_DEVICE_LAN = +- "urn:schemas-upnp-org:device:LANDevice:1"; +- +-const std::string &CUPnPLib::UPNP_SERVICE_LAYER3_FORWARDING = +- "urn:schemas-upnp-org:service:Layer3Forwarding:1"; +-const std::string &CUPnPLib::UPNP_SERVICE_WAN_COMMON_INTERFACE_CONFIG = +- "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1"; +-const std::string &CUPnPLib::UPNP_SERVICE_WAN_IP_CONNECTION = +- "urn:schemas-upnp-org:service:WANIPConnection:1"; +-const std::string &CUPnPLib::UPNP_SERVICE_WAN_PPP_CONNECTION = +- "urn:schemas-upnp-org:service:WANPPPConnection:1"; +- +- +-CUPnPLib::CUPnPLib(CUPnPControlPoint &ctrlPoint) +-: +-m_ctrlPoint(ctrlPoint) +-{ +-} +- ++static const std::string ROOT_DEVICE("upnp:rootdevice"); + +-std::string CUPnPLib::GetUPnPErrorMessage(int code) const +-{ +- return UpnpGetErrorMessage(code); ++namespace Device { ++ static const std::string IGW("urn:schemas-upnp-org:device:InternetGatewayDevice:1"); ++ static const std::string WAN("urn:schemas-upnp-org:device:WANDevice:1"); ++ static const std::string WAN_Connection("urn:schemas-upnp-org:device:WANConnectionDevice:1"); ++ static const std::string LAN("urn:schemas-upnp-org:device:LANDevice:1"); + } + ++namespace Service { ++ static const std::string Layer3_Forwarding("urn:schemas-upnp-org:service:Layer3Forwarding:1"); ++ static const std::string WAN_Common_Interface_Config("urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1"); ++ static const std::string WAN_IP_Connection("urn:schemas-upnp-org:service:WANIPConnection:1"); ++ static const std::string WAN_PPP_Connection("urn:schemas-upnp-org:service:WANPPPConnection:1"); ++} + +-std::string CUPnPLib::processUPnPErrorMessage( ++static std::string ProcessErrorMessage( + const std::string &messsage, + int errorCode, + const DOMString errorString, +- IXML_Document *doc) const ++ IXML_Document *doc) + { + std::ostringstream msg; + if (errorString == NULL || *errorString == 0) { +@@ -142,7 +124,7 @@ std::string CUPnPLib::processUPnPErrorMessage( + messsage << + ": Error code :'"; + if (doc) { +- CUPnPError e(*this, doc); ++ CUPnPError e(doc); + msg << e.getErrorCode() << + "', Error description :'" << + e.getErrorDescription() << +@@ -158,7 +140,7 @@ std::string CUPnPLib::processUPnPErrorMessage( + msg << "Error: " << + messsage << + ": UPnP SDK error: " << +- GetUPnPErrorMessage(errorCode) << ++ UpnpGetErrorMessage(errorCode) << + " (" << errorCode << ")."; + AddDebugLogLineN(logUPnP, msg); + } +@@ -167,22 +149,22 @@ std::string CUPnPLib::processUPnPErrorMessage( + } + + +-void CUPnPLib::ProcessActionResponse( ++static void ProcessActionResponse( + IXML_Document *RespDoc, +- const std::string &actionName) const ++ const std::string &actionName) + { + std::ostringstream msg; + msg << "Response: "; +- IXML_Element *root = Element_GetRootElement(RespDoc); +- IXML_Element *child = Element_GetFirstChild(root); ++ IXML_Element *root = IXML::Document::GetRootElement(RespDoc); ++ IXML_Element *child = IXML::Element::GetFirstChild(root); + if (child) { + while (child) { +- const DOMString childTag = Element_GetTag(child); +- std::string childValue = Element_GetTextValue(child); ++ const DOMString childTag = IXML::Element::GetTag(child); ++ std::string childValue = IXML::Element::GetTextValue(child); + msg << "\n " << + childTag << "='" << + childValue << "'"; +- child = Element_GetNextSibling(child); ++ child = IXML::Element::GetNextSibling(child); + } + } else { + msg << "\n Empty response for action '" << +@@ -191,61 +173,53 @@ void CUPnPLib::ProcessActionResponse( + AddDebugLogLineN(logUPnP, msg); + } + ++} /* namespace UPnP */ ++ ++ ++namespace IXML { + + /*! + * \brief Returns the root node of a given document. + */ +-IXML_Element *CUPnPLib::Element_GetRootElement( +- IXML_Document *doc) const ++IXML_Element *Document::GetRootElement(IXML_Document *doc) + { +- IXML_Element *root = reinterpret_cast<IXML_Element *>( +- ixmlNode_getFirstChild(&doc->n)); +- +- return root; ++ return reinterpret_cast<IXML_Element *>(ixmlNode_getFirstChild(&doc->n)); + } + ++namespace Element { + + /*! + * \brief Returns the first child of a given element. + */ +-IXML_Element *CUPnPLib::Element_GetFirstChild( +- IXML_Element *parent) const ++IXML_Element *GetFirstChild(IXML_Element *parent) + { +- IXML_Node *child = ixmlNode_getFirstChild(&parent->n); +- +- return reinterpret_cast<IXML_Element *>(child); ++ return reinterpret_cast<IXML_Element *>(ixmlNode_getFirstChild(&parent->n)); + } + + ++ + /*! + * \brief Returns the next sibling of a given child. + */
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.