Added struct for Metalink/HTTP

src/Makefile.am

@@ -224,7 +224,8 @@ SRCS =  Socket.h\
 	HttpServer.cc HttpServer.h\
 	StreamPieceSelector.h\
 	DefaultStreamPieceSelector.cc DefaultStreamPieceSelector.h\
-	InorderStreamPieceSelector.cc InorderStreamPieceSelector.h
+	InorderStreamPieceSelector.cc InorderStreamPieceSelector.h\
+	MetalinkHttpEntry.cc MetalinkHttpEntry.h
 
 if ENABLE_XML_RPC
 SRCS += XmlRpcRequestParserController.cc XmlRpcRequestParserController.h\

src/MetalinkHttpEntry.cc

@@ -0,0 +1,71 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2011 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "MetalinkHttpEntry.h"
+
+namespace aria2 {
+
+MetalinkHttpEntry::MetalinkHttpEntry()
+  : pri(999999),
+    pref(false)
+{}
+
+MetalinkHttpEntry::~MetalinkHttpEntry() {}
+
+void MetalinkHttpEntry::swap(MetalinkHttpEntry& other)
+{
+  using std::swap;
+  if(this != &other) {
+    swap(uri, other.uri);
+    swap(pri, other.pri);
+    swap(pref, other.pref);
+    swap(geo, other.geo);
+  }
+}
+
+bool MetalinkHttpEntry::operator<(const MetalinkHttpEntry& rhs) const
+{
+  if(pref^rhs.pref) {
+    return pref;
+  } else {
+    return pri < rhs.pri;
+  }
+}
+
+void swap(MetalinkHttpEntry& a, MetalinkHttpEntry& b)
+{
+  a.swap(b);
+}
+
+} // namespace aria2

src/MetalinkHttpEntry.h

@@ -0,0 +1,62 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2011 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#ifndef D_METALINK_HTTP_ENTRY_H
+#define D_METALINK_HTTP_ENTRY_H
+
+#include "common.h"
+
+#include <string>
+
+namespace aria2 {
+
+// Holds values of Metalink/HTTP in Link header fields.  Metalink/HTTP
+// is defined by http://tools.ietf.org/html/rfc6249
+struct MetalinkHttpEntry {
+  std::string uri;
+  int pri;
+  bool pref;
+  std::string geo;
+
+  MetalinkHttpEntry();
+  ~MetalinkHttpEntry();
+  void swap(MetalinkHttpEntry& c);
+  bool operator<(const MetalinkHttpEntry& rhs) const;
+};
+
+void swap(MetalinkHttpEntry& a, MetalinkHttpEntry& b);
+
+} // namespace aria2
+
+#endif // D_METALINK_HTTP_ENTRY_H