Browse Source

Initial commit for xpir as a library

Marc-Olivier Killijian 6 years ago
commit
ab85ef48b1
100 changed files with 17018 additions and 0 deletions
  1. 2 0
      .gitignore
  2. 37 0
      CMakeCompilers.txt
  3. 61 0
      CMakeLists.txt
  4. 24 0
      FindGMP.cmake
  5. 18 0
      FindMPFR.cmake
  6. 674 0
      GPL-3.0
  7. 33 0
      LICENSE
  8. 120 0
      README.md
  9. 5 0
      TODO.txt
  10. 24 0
      apps/CMakeLists.txt
  11. 14 0
      apps/client/CMakeLists.txt
  12. 189 0
      apps/client/DESC.cpp
  13. 55 0
      apps/client/DESC.hpp
  14. 508 0
      apps/client/PIRClient.cpp
  15. 122 0
      apps/client/PIRClient.hpp
  16. 111 0
      apps/client/PIRClientLog.cpp
  17. 42 0
      apps/client/PIRClientLog.hpp
  18. 69 0
      apps/client/PIRController.cpp
  19. 47 0
      apps/client/PIRController.hpp
  20. 33 0
      apps/client/PIRView.cpp
  21. 51 0
      apps/client/PIRView.hpp
  22. 162 0
      apps/client/PIRViewCLI.cpp
  23. 48 0
      apps/client/PIRViewCLI.hpp
  24. 418 0
      apps/client/main.cpp
  25. 35 0
      apps/client/main.hpp
  26. 6 0
      apps/optim/CMakeLists.txt
  27. 1069 0
      apps/optim/PIROptimizer.cpp
  28. 148 0
      apps/optim/PIROptimizer.hpp
  29. 54 0
      apps/server/CMakeLists.txt
  30. 238 0
      apps/server/DBDirectoryProcessor.cpp
  31. 67 0
      apps/server/DBDirectoryProcessor.hpp
  32. 111 0
      apps/server/DBGenerator.cpp
  33. 52 0
      apps/server/DBGenerator.hpp
  34. 47 0
      apps/server/DBHandler.hpp
  35. 134 0
      apps/server/PIRServer.cpp
  36. 59 0
      apps/server/PIRServer.hpp
  37. 623 0
      apps/server/PIRSession.cpp
  38. 108 0
      apps/server/PIRSession.hpp
  39. 75 0
      apps/server/ServerService.cpp
  40. 37 0
      apps/server/ServerService.hpp
  41. 126 0
      apps/server/main.cpp
  42. 37 0
      apps/server/main.hpp
  43. 29 0
      apps/simplepir/CMakeLists.txt
  44. 241 0
      apps/simplepir/simplePIR.cpp
  45. 273 0
      apps/tools/check-correctness.sh
  46. 29 0
      apps/tools/makedb.sh
  47. 82 0
      apps/tools/mkdb-correctness.sh
  48. 19 0
      crypto/AbstractPublicParameters.cpp
  49. 46 0
      crypto/AbstractPublicParameters.hpp
  50. 34 0
      crypto/CMakeLists.txt
  51. 35 0
      crypto/CryptographicSystem.hpp
  52. 24 0
      crypto/HomomorphicCrypto.cpp
  53. 69 0
      crypto/HomomorphicCrypto.hpp
  54. 87 0
      crypto/HomomorphicCryptoFactory_internal.cpp
  55. 37 0
      crypto/HomomorphicCryptoFactory_internal.hpp
  56. 32 0
      crypto/LatticesBasedCryptosystem.cpp
  57. 53 0
      crypto/LatticesBasedCryptosystem.hpp
  58. 850 0
      crypto/NFLLWE.cpp
  59. 118 0
      crypto/NFLLWE.hpp
  60. 38 0
      crypto/NFLLWEDatatypes.hpp
  61. 171 0
      crypto/NFLLWEPublicParameters.cpp
  62. 81 0
      crypto/NFLLWEPublicParameters.hpp
  63. 46 0
      crypto/NFLParams.cpp
  64. 44 0
      crypto/NFLParams.hpp
  65. 922 0
      crypto/NFLlib.cpp
  66. 655 0
      crypto/NFLlib.hpp
  67. 88 0
      crypto/NoCryptography.cpp
  68. 52 0
      crypto/NoCryptography.hpp
  69. 40 0
      crypto/NoCryptographyPublicParameters.cpp
  70. 45 0
      crypto/NoCryptographyPublicParameters.hpp
  71. 27 0
      crypto/PRNGInterface.hpp
  72. 630 0
      crypto/PaillierAdapter.cpp
  73. 97 0
      crypto/PaillierAdapter.hpp
  74. 187 0
      crypto/PaillierKeys.cpp
  75. 72 0
      crypto/PaillierKeys.hpp
  76. 30 0
      crypto/PaillierPrivateParameters.cpp
  77. 34 0
      crypto/PaillierPrivateParameters.hpp
  78. 142 0
      crypto/PaillierPublicParameters.cpp
  79. 60 0
      crypto/PaillierPublicParameters.hpp
  80. 6 0
      crypto/prng/CMakeLists.txt
  81. 27 0
      crypto/prng/crypto_stream_salsa20.h
  82. 4827 0
      crypto/prng/crypto_stream_salsa20_amd64_xmm6.s
  83. 48 0
      crypto/prng/fastrandombytes.cpp
  84. 12 0
      crypto/prng/fastrandombytes.h
  85. 39 0
      crypto/prng/randombytes.cpp
  86. 11 0
      crypto/prng/randombytes.h
  87. 40 0
      helper_script.sh
  88. 226 0
      libpir.hpp
  89. 23 0
      pir/BasicLWECommon.hpp
  90. 39 0
      pir/CMakeLists.txt
  91. 23 0
      pir/ClientDefines.hpp
  92. 30 0
      pir/GlobalConstant.hpp
  93. 23 0
      pir/PIROptimizerCommand.hpp
  94. 31 0
      pir/PIRParameters.hpp
  95. 23 0
      pir/PIRParametersExchangeMethods.hpp
  96. 6 0
      pir/events/CMakeLists.txt
  97. 27 0
      pir/events/CatalogEvent.cpp
  98. 36 0
      pir/events/CatalogEvent.hpp
  99. 62 0
      pir/events/MessageEvent.cpp
  100. 47 0
      pir/events/MessageEvent.hpp

+ 2 - 0
.gitignore

@@ -0,0 +1,2 @@
+/local/
+/_build/

+ 37 - 0
CMakeCompilers.txt

@@ -0,0 +1,37 @@
+include(CheckCXXCompilerFlag)
+
+# C++11 support
+CHECK_CXX_COMPILER_FLAG(-std=c++11 COMPILER_SUPPORTS_CXX11)
+if(COMPILER_SUPPORTS_CXX11)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+else()
+    CHECK_CXX_COMPILER_FLAG(-std=c++0x COMPILER_SUPPORTS_CXX0X)
+    if(COMPILER_SUPPORTS_CXX0X)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+    else()
+        message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+    endif()
+endif()
+
+# Use openmp
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
+set(CMAKE_EXE_LINKER_FLAGS "-fopenmp")
+
+# optimization flags support
+if(CMAKE_BUILD_TYPE MATCHES Release)
+	set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3")
+	foreach(FLAG -march=native -mtune=native -funroll-loops)
+		string(REGEX REPLACE -= _ FLAG_ID ${FLAG})
+		string(TOUPPER ${FLAG_ID} FLAG_ID)
+		CHECK_CXX_COMPILER_FLAG(${FLAG} COMPILER_SUPPORTS${FLAG_ID})
+	    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${FLAG}")
+	endforeach()
+  # For OSX use clang
+  if(APPLE)
+	    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse -Wa,-q")
+  endif()
+else()
+    add_definitions(-DCHECK_STRICTMOD)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb")
+endif()
+

+ 61 - 0
CMakeLists.txt

@@ -0,0 +1,61 @@
+cmake_minimum_required(VERSION 2.6.0)
+project(XPIR)
+include(CMakeCompilers.txt)
+
+enable_language(CXX ASM)
+
+if(APPLE)
+    cmake_policy(SET CMP0042 NEW)
+endif()
+
+set(CMAKE_C_COMPILER "gcc")
+set(CMAKE_CXX_COMPILER "g++")
+set(CMAKE_CXX_FLAGS "-std=c++11 -fopenmp -ggdb")
+set(CMAKE_EXE_LINKER_FLAGS "-fopenmp")
+set(BOOST_ROOT "./local")
+
+SET( Boost_USE_STATIC_LIBS FALSE )
+find_package(Boost 1.55.0  REQUIRED
+  COMPONENTS atomic chrono date_time exception program_options regex system thread)
+include_directories(${Boost_INCLUDE_DIR})
+link_directories(${Boost_LIBRARY_DIR})
+	
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
+find_package(GMP 6 REQUIRED)
+find_package(MPFR 3.1.2 REQUIRED)
+
+include_directories("/opt/local/include")
+
+	option(SEND_CATALOG "Send the catalog to the client (default is send catalog if |catalog|<1000)" ON)
+	if(SEND_CATALOG)
+	    message(STATUS "Send the catalog to the client")
+	    add_definitions(-DSEND_CATALOG)
+    else()
+	    message(STATUS "Do not send the catalog to the client")	
+	endif()
+	
+	option(MULTI_THREAD "Use multi-threading" ON)
+	if(MULTI_THREAD)
+	    message(STATUS "Use multi-threading")
+	    add_definitions(-DMULTI_THREAD)
+	else()
+	    message(STATUS "Do not use multi-threading")		
+	endif()
+	
+	option(PERF_TIMERS "Show performance measurements during execution" ON)
+	if(PERF_TIMERS)
+	    message(STATUS "Show performance measurements during execution")
+	    add_definitions(-DPERF_TIMERS)
+	else()
+	    message(STATUS "Do not show performance measurements during execution")
+	endif()
+
+
+
+
+	add_subdirectory("apps")
+	add_subdirectory("crypto")
+	add_subdirectory("pir")
+	
+	
+

+ 24 - 0
FindGMP.cmake

@@ -0,0 +1,24 @@
+# Try to find the GMP librairies
+# GMP_FOUND - system has GMP lib
+# GMP_INCLUDE_DIR - the GMP include directory
+# GMP_LIBRARIES - Libraries needed to use GMP
+
+# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if (GMP_INCLUDE_DIR AND GMP_LIBRARIES)
+		# Already in cache, be silent
+		set(GMP_FIND_QUIETLY TRUE)
+endif (GMP_INCLUDE_DIR AND GMP_LIBRARIES)
+
+find_path(GMP_INCLUDE_DIR NAMES gmp.h HINTS "./local/include")
+find_library(GMP_LIBRARIES NAMES gmp libgmp HINTS "./local/lib")
+find_library(GMPXX_LIBRARIES NAMES gmpxx libgmpxx HINTS "./local/lib")
+MESSAGE(STATUS "GMP libs: " ${GMP_LIBRARIES} " " ${GMPXX_LIBRARIES} )
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMP DEFAULT_MSG GMP_INCLUDE_DIR GMP_LIBRARIES)
+
+mark_as_advanced(GMP_INCLUDE_DIR GMP_LIBRARIES)

+ 18 - 0
FindMPFR.cmake

@@ -0,0 +1,18 @@
+# Try to find the MPFR librairies
+# GMP_FOUND - system has GMP lib
+# GMP_INCLUDE_DIR - the GMP include directory
+# GMP_LIBRARIES - Libraries needed to use GMP
+
+if (MPFR_INCLUDE_DIR AND MPFR_LIBRARIES)
+		# Already in cache, be silent
+		set(MPFR_FIND_QUIETLY TRUE)
+endif (MPFR_INCLUDE_DIR AND MPFR_LIBRARIES)
+
+find_path(MPFR_INCLUDE_DIR NAMES mpfr.h HINTS "./local/include")
+find_library(MPFR_LIBRARIES NAMES mpfr libmpfr HINTS "./local/lib")
+MESSAGE(STATUS "mpfr libs: " ${MPFR_LIBRARIES})
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPFR DEFAULT_MSG MPFR_INCLUDE_DIR MPFR_LIBRARIES)
+
+mark_as_advanced(MPFR_INCLUDE_DIR MPFR_LIBRARIES)

+ 674 - 0
GPL-3.0

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 3 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

+ 33 - 0
LICENSE

@@ -0,0 +1,33 @@
+/* Copyright (C) 2014 Carlos Aguilar Melchor, Joris Barrier, Marc-Olivier Killijian
+ * This file is part of XPIR.
+ *
+ *  XPIR 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  XPIR 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 XPIR.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+The files in this project are released under various licenses, all of
+them compatible with the GPLv3.
+
+The dependencies directory at the root of the project contains: a full
+version of the GMP library; a full version of the MPFR library; and a
+subpart of the Boost library (extracted with their internal tool
+bcp). Licensing rules for the associated files are given directly in
+the corresponding directories. GMP and MPFR are released under GPLv3
+and Boost under Boost license which is compatible with GPLv3.
+
+For the rest of the project files, most are released under the GPLv3
+itself, but we reused some pieces of code sometimes, which are either
+under a BSD license, or in the public domain. Outside of the
+dependencies directory named above, the license for each file is given
+at the beggining of the file.
+

File diff suppressed because it is too large
+ 120 - 0
README.md


+ 5 - 0
TODO.txt

@@ -0,0 +1,5 @@
+  * verifier les makefiles originaux pour etre surs qu on oublie rien qu on faisait en master
+  
+  * verifier d'autres archi/install systeme (osx par exemple en particulier là ou il traine des $home)
+  * gerer la compilation release en OSX
+

+ 24 - 0
apps/CMakeLists.txt

@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 2.6.0)
+
+add_subdirectory("client")
+add_subdirectory("optim")
+add_subdirectory("server")
+add_subdirectory("simplepir")
+
+set(CMAKE_CXX_FLAGS "-std=c++11")
+set (CMAKE_EXE_LINKER_FLAGS "-fopenmp")
+if (APPLE)
+        set(CMAKE_EXE_LINKER_FLAGS "-fopenmp -L$ENV{HOME}/Code/xpir/freshxpir/xpir-ng/local/lib/ -lboost_program_options")
+
+endif()
+include_directories(..)
+include_directories(../..)
+
+add_custom_target(build-time-make-directory ALL COMMAND ${CMAKE_COMMAND} -E make_directory "server/db")
+add_custom_target(build-time-make-directory1 ALL COMMAND ${CMAKE_COMMAND} -E make_directory "server/exp")
+add_custom_target(build-time-make-directory2 ALL COMMAND ${CMAKE_COMMAND} -E make_directory "client/reception")
+add_custom_target(build-time-make-directory3 ALL COMMAND ${CMAKE_COMMAND} -E make_directory "client/exp")
+
+#add_executable(simple_pir simplePIR.cpp ../pir/libpir.hpp ./server/DBGenerator.cpp ./server/DBDirectoryProcessor.cpp)
+
+#target_link_libraries(simple_pir pir_server_pir pir_query_gen pir_reply pir pir_client_events pir_client_optim pthread ${MPFR_LIBRARIES} ${Boost_LIBRARIES} ${GMP_LIBRARIES} ${GMPXX_LIBRARIES})

+ 14 - 0
apps/client/CMakeLists.txt

@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 2.6.0)
+
+set (CMAKE_EXE_LINKER_FLAGS "-fopenmp") 
+if (APPLE)
+	set(CMAKE_EXE_LINKER_FLAGS "-fopenmp -L$ENV{HOME}/Code/xpir/freshxpir/xpir-ng/local/lib/ -lboost_program_options")
+
+endif()
+include_directories(..)
+include_directories(../..)
+
+add_executable(pir_client DESC.cpp PIRClient.cpp PIRClientLog.cpp PIRController.cpp PIRView.cpp PIRViewCLI.cpp main.cpp)
+
+target_link_libraries(pir_client pir_client_optim pir pthread ${MPFR_LIBRARIES} ${Boost_LIBRARIES} ${GMP_LIBRARIES} ${GMPXX_LIBRARIES})
+

+ 189 - 0
apps/client/DESC.cpp

@@ -0,0 +1,189 @@
+/* Copyright (C) 2014 Carlos Aguilar Melchor, Joris Barrier, Marc-Olivier Killijian
+ * This file is part of XPIR.
+ *
+ *  XPIR 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  XPIR 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 XPIR.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "DESC.hpp"
+//#define NO_CATALOG //Use this option for performance tests (only with auto-choice)
+
+/**
+ *	Class constructor.
+ *	Param :
+ *		-	messageListener& messageListeners_ : message listerner reference to display error message.
+ **/
+DESC::DESC(messageListener& messageListeners_):
+	messageListeners(messageListeners_),
+	maxFileSize(0)
+{
+    ; // This semicolon is necessary under some uncertain circumstances .... e.g. OSX/gcc4.8.1
+}
+
+/**
+ *	Generate a menu from a char* buffer.
+ *	Param :
+ *		- char* receiveBuffer : buffer to parse.
+ **/
+void DESC::makeMenu(char* receivedBuffer)
+{
+	maxFileSize = 0;
+	uint64_t fileCount = 0;
+	char fileName[FILENAME_MAX_BYTE_SIZE + 1];
+	char tmpSize[FILENAME_MAX_BYTE_SIZE + 1];
+	stringstream ss (receivedBuffer);
+	unsigned int catalogType;
+#ifdef DEBUG
+  std::cout << "DESC: catalog received : ..."<<std::endl<<receivedBuffer<<std::endl;
+#endif
+	if (ss.good ())
+	{
+		//The first line of the catalog is the catalog type
+		ss >> catalogType;
+		if(catalogType==0) {
+#ifdef DEBUG
+			std::cout << "DESC: catalog type 0 : "<<catalogType<<std::endl;
+#endif		
+			ss >> fileCount;
+			//The rest of catalog alternates filename lines and size lines.
+			ss.getline (fileName, FILENAME_MAX_BYTE_SIZE);
+
+      nbFiles = 0;
+			for (uint64_t i = 0; i < fileCount; i++) 
+			{
+				ss.getline (fileName, FILENAME_MAX_BYTE_SIZE);
+				ss.getline (tmpSize, FILENAME_MAX_BYTE_SIZE);
+
+				if (ss.gcount () > 0) 
+				{
+					fileList.push_back(fileName);
+					fileSize.push_back(atoi(tmpSize));
+          nbFiles++;
+#ifdef DEBUG
+          std::cout<<"DESC: "<<i<<"-"<<fileName<<"-"<<tmpSize<<std::endl;
+#endif
+          if(maxFileSize < fileSize.back())
+						maxFileSize = fileSize.back();
+				}
+			}
+		} else if(catalogType==1) {
+#ifdef DEBUG
+			std::cout << "DESC: catalog type 0 : "<<catalogType<<std::endl;
+#endif		
+			
+			ss >> fileCount;
+			ss.getline (tmpSize, FILENAME_MAX_BYTE_SIZE);
+			ss.getline (tmpSize, FILENAME_MAX_BYTE_SIZE);
+			maxFileSize=atoi(tmpSize);
+#ifndef NO_CATALOG
+      for (uint64_t i = 0; i < fileCount; i++) 
+			{
+					fileList.push_back(std::to_string(i));
+					fileSize.push_back(maxFileSize);
+			}
+#endif
+      nbFiles = fileCount;
+		} else {
+			MessageEvent event(ERROR,"Catalog type unknown "+catalogType, __FUNCTION__);
+			messageListeners(event);
+		}
+	} else {
+			MessageEvent event(ERROR,"Impossible to read catalog from the server.", __FUNCTION__);
+			messageListeners(event);
+	}
+}
+
+/**
+ *	Get file name from a given index.
+ *	Param :
+ *		- int index : file index.
+ *
+ *	Return :
+ *		- std::string : return fileName if exist and "None" else.
+ **/
+string DESC::getFileName(uint64_t index) 
+{
+#ifndef NO_CATALOG
+	return (index < nbFiles) ?  fileList[index] : "None";
+#else
+	return (index < nbFiles) ?  std::to_string(index) : "None";
+#endif
+}
+
+/**
+ *	Get file size frome a given index.
+ *	Param :
+ *		- int index : file index.
+ *
+ *	Return :
+ *		- int : return fileSize of exist and 0 else.
+ *
+ **/
+uint64_t DESC::getFileSize(uint64_t index) 
+{
+#ifndef NO_CATALOG
+	return (index < fileSize.size()) ? fileSize[index] : -1;
+#else
+	return (index < nbFiles) ? maxFileSize : -1;
+#endif
+}
+
+/**
+ *	Checks whether the provided file number exists. 
+ *	Param : 
+ *		- int dex : file index.
+ *
+ *	Return :
+ *		- bool : true if file exist, false else.
+ **/
+bool DESC::file_exists (uint64_t index) 
+{
+	return (index < nbFiles) ? true : false; 
+}
+
+/**
+ *	Get number of files.
+ *	Return :
+ *		- unsigned int : number of files.
+ **/
+uint64_t DESC::getFilesNum() 
+{
+	return nbFiles;
+}
+
+/**
+ *	Get the biggest file.
+ *	Return :
+ *		- int : biggest file size.
+ *		
+ **/
+uint64_t DESC::getMaxFileSize()
+{
+	return maxFileSize;
+}
+
+/**
+ *	Get file list.
+ *	Return :
+ *		- const std::vector<string>& : constant reference to the fileList attribute. 
+ **/
+const vector<string>& DESC::getFileList()
+{
+	return fileList;
+}
+
+DESC::~DESC() 
+{
+	fileList.clear();
+	fileSize.clear();
+}

+ 55 - 0
apps/client/DESC.hpp

@@ -0,0 +1,55 @@
+/* Copyright (C) 2014 Carlos Aguilar Melchor, Joris Barrier, Marc-Olivier Killijian
+ * This file is part of XPIR.
+ *
+ *  XPIR 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  XPIR 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 XPIR.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef DEF_DESC
+#define DEF_DESC
+
+#include <string>
+#include <vector>
+#include <sstream>
+#include <iostream>
+#include <boost/signals2.hpp>
+
+#include "pir/events/MessageEvent.hpp"
+
+using namespace std;
+#define FILENAME_MAX_BYTE_SIZE 1023	
+
+typedef boost::signals2::signal<void (MessageEvent&)>   messageListener;
+class DESC
+{
+    public :
+				DESC (messageListener& messageListeners);
+        void makeMenu(char* receivedBuffer);
+        bool file_exists (uint64_t ID);
+       
+				string 			 getFileName(uint64_t index);
+        uint64_t				 getFileSize(uint64_t index);
+				const        vector<string>& getFileList();
+        uint64_t getFilesNum();
+				uint64_t 				 getMaxFileSize();
+   
+				~DESC();
+		private:
+				messageListener& messageListeners;
+        vector<string> fileList;
+        vector<uint64_t> fileSize;
+				uint64_t maxFileSize;
+        uint64_t nbFiles;
+};
+
+#endif

+ 508 - 0
apps/client/PIRClient.cpp

@@ -0,0 +1,508 @@
+/* Copyright (C) 2014 Carlos Aguilar Melchor, Joris Barrier, Marc-Olivier Killijian
+ * This file is part of XPIR.
+ *
+ *  XPIR 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  XPIR 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 XPIR.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "PIRClient.hpp"
+//Use this to limit the upload speed to UPLOAD_LIMIT bits per second
+//#define UPLOAD_LIMIT 100000000UL
+
+
+PIRClientSimple::PIRClientSimple(boost::asio::io_service& ios, ClientParams params, FixedVars vars):
+	socket_up(ios),
+  replyWriter(pirParams, writeListeners, messageListeners),
+	catalog(messageListeners),
+  clientParams(params),
+  fixedVars(vars),
+  optimum(vars),
+  no_pipeline_mode(false)
+{
+  replyWriter.setdontWrite(params.dontwrite);
+      //string lwe_params(crypto_params_const);
+  //cryptoMethod.getPublicParameters().computeNewParameters(lwe_params);
+  //pirParams.d = kDimensionNumber;
+}
+
+void PIRClientSimple::joinAllThreads()
+{
+  replyExt->replyThread.join();
+  replyWriter.join();
+}
+
+PIRClientSimple::~PIRClientSimple()
+{
+  joinAllThreads();
+  delete cryptoMethod;
+}
+
+void PIRClientSimple::connect()
+{	
+	using namespace boost::asio::ip;
+
+	try
+	{
+		socket_up.connect(tcp::endpoint(address::from_string(clientParams.server_ip), clientParams.port));
+    
+    // Tell the server we are a client
+    int is_client = 1;
+		write(socket_up, boost::asio::buffer(&is_client, sizeof(int)));
+
+  }
+	catch (const std::exception& ex)
+	{
+		exitWithErrorMessage(__FUNCTION__, ex.what());
+	}
+}
+/**
+ *  Downloads the file catalog from the server.
+ *  Exception :
+ *  - Stop the programme if any network trouble.
+ **/
+void PIRClientSimple::downloadCatalog()
+{
+	boost::uint64_t size = 1;
+	try
+	{
+		read(socket_up, boost::asio::buffer(&size, sizeof(size)));
+		std::cout<< "PIRClient: Catalog bytesize is "<<size<<std::endl;
+		char* buf = new char[size + 1]();
+	
+		if (read(socket_up, boost::asio::buffer(buf, size)) < size )
+      	  writeWarningMessage(__FUNCTION__, " Catalog has not been fully received.");
+   
+		catalog.makeMenu(buf);
+
+		if (catalog.getFilesNum() == 0) 
+		{
+			writeWarningMessage(__FUNCTION__,"Empty catalog recieved ! Is there a db directory with files in the server/ directory ? Aborting ");
+			exit(1);
+		}
+   
+    delete[] buf;
+    
+    std::cout << "PIRClient: Catalog received with " << catalog.getFilesNum() << " files" << std::endl;
+    
+  }
+	catch (const std::exception& ex)
+	{
+		exitWithErrorMessage(__FUNCTION__, ex.what());
+	}
+}
+
+void PIRClientSimple::optimize()
+{
+  if (exchange_method == CLIENT_DRIVEN)
+  {
+    PIROptimizer optimizer;
+    if (clientParams.verboseoptim == false) optimizer.silent = true;
+    std::cout << "PIRClient: Starting optimization ..." << std::endl;
+    OptimVars op = optimizer.optimizeFromServer(fixedVars, socket_up);
+    optimum = op;
+    std::cout << "PIRClient: Optimization returned alpha=" << optimum.alpha << " d=" << optimum.d << " crypto_params=" << optimum.crypto_params << std::endl;
+    pirParams.d = optimum.d;
+    pirParams.alpha = optimum.alpha;
+    optimizer.getDimSize(optimum.getFixedVars().n, optimum.alpha, optimum.d, pirParams.n);
+    pirParams.crypto_params = std::string(optimum.crypto_params);
+  }
+}
+
+void PIRClientSimple::processPIRParams()
+{
+  if (exchange_method == CLIENT_DRIVEN)
+  {
+    sendPirParams();
+  }
+  else rcvPirParams();
+}
+
+/**
+ *  Sends PIR parameters to the server.
+ *  Exception :
+ *  - Stop the programme if any network trouble.
+ **/
+void PIRClientSimple::sendPirParams()
+{
+  try 
+	{
+		write(socket_up, boost::asio::buffer(&pirParams.d, sizeof(int)));
+		write(socket_up, boost::asio::buffer(&pirParams.alpha, sizeof(int)));
+
+		for (unsigned int i = 0 ; i < pirParams.d ; i++)
+		{
+			write(socket_up, boost::asio::buffer(&pirParams.n[i], sizeof(int)));
+		}
+	}
+	catch (const std::exception& ex)
+	{
+		exitWithErrorMessage(__FUNCTION__, ex.what());
+	}
+}
+
+void PIRClientSimple::rcvPirParams()
+{
+  try 
+	{
+		read(socket_up, boost::asio::buffer(&pirParams.d, sizeof(int)));
+		read(socket_up, boost::asio::buffer(&pirParams.alpha, sizeof(int)));
+
+		for (unsigned int i = 0 ; i < pirParams.d ; i++)
+		{
+			read(socket_up, boost::asio::buffer(&pirParams.n[i], sizeof(int)));
+		}
+
+    std::cout << "PIRClient: Received PIR parameters alpha=" << pirParams.alpha << " d=" << pirParams.d << std::endl; 
+	}
+	catch (const std::exception& ex)
+	{
+		exitWithErrorMessage(__FUNCTION__, ex.what());
+	}
+}
+
+void PIRClientSimple::rcvPIRParamsExchangeMethod()
+{
+  try
+  {
+    read(socket_up, boost::asio::buffer(&exchange_method, sizeof(short)));
+    if (exchange_method == CLIENT_DRIVEN) 
+    {
+      std::cout << "PIRClient: Client-driven mode used" << std::endl;
+    } 
+    else 
+    {
+      std::cout << "PIRClient: Server-driven mode used" << std::endl;
+    }
+  }
+	catch (const std::exception& ex)
+  {
+		exitWithErrorMessage(__FUNCTION__, ex.what());
+  }
+}
+
+void PIRClientSimple::processCryptoParams() {
+  bool send_paramsandkey = true;
+  if (exchange_method == CLIENT_DRIVEN) 
+  {
+    cryptoMethod = HomomorphicCryptoFactory_internal::getCryptoMethod(optimum.crypto_params);
+    replyWriter.setCryptoMethod(cryptoMethod);
+    sendCryptoParams(send_paramsandkey);
+  }
+  else 
+  {
+    rcvCryptoParams(); 
+    cryptoMethod = HomomorphicCryptoFactory_internal::getCryptoMethod(pirParams.crypto_params);
+    replyWriter.setCryptoMethod(cryptoMethod);
+    sendCryptoParams(!send_paramsandkey);
+  }
+}
+
+/**
+ *  Send cryptographics parameters (e.g : key) to the server.
+ *  Exception :
+ *  - Stop the programme if any network trouble.
+ **/
+void PIRClientSimple::sendCryptoParams(bool paramsandkey)
+{
+	unsigned int size; 
+	char* key;
+
+	try
+	{
+    if (paramsandkey == true)
+    {
+      bool shortversion = true;
+
+      string crypto_params = cryptoMethod->getSerializedCryptoParams(!shortversion);
+      size = crypto_params.length();
+
+		  write(socket_up, boost::asio::buffer(&size, sizeof(size)));
+      write(socket_up, boost::asio::buffer(crypto_params));
+    }
+
+    size = ceil((double) cryptoMethod->getPublicParameters().getSerializedModulusBitsize() / GlobalConstant::kBitsPerByte);
+		write(socket_up, boost::asio::buffer(&size, sizeof(size)));
+
+		key = cryptoMethod->getPublicParameters().getByteModulus();
+		write(socket_up, boost::asio::buffer(key, size));//Send key
+		delete[] key;
+	}
+	catch (const std::exception& ex) 
+	{
+		exitWithErrorMessage(__FUNCTION__, ex.what());
+	}
+}
+
+void PIRClientSimple::rcvCryptoParams() {
+
+  try
+  {
+    int crypto_params_size = 0; 
+
+    read(socket_up, boost::asio::buffer(&crypto_params_size, sizeof(crypto_params_size)));
+
+    char crypto_params[crypto_params_size + 1];
+
+    int read_size = read(socket_up, boost::asio::buffer(crypto_params,crypto_params_size));
+    crypto_params[read_size] = '\0';
+
+    pirParams.crypto_params = string(crypto_params);
+
+    std::cout << "PIRClient: Received crypto parameters " << crypto_params << std::endl; 
+  }
+	catch (const std::exception& ex) 
+	{
+		exitWithErrorMessage(__FUNCTION__, ex.what());
+	}
+
+}
+
+/**
+ *  Launches the choose File action to the recorded view. If autochoice is set, 
+ *  the first file is chosen.
+ **/
+void PIRClientSimple::chooseFile() 
+{
+	chosenElement = 0;
+
+  if(!clientParams.autochoice)
+	{
+		CatalogEvent catalogEvent(catalog.getFileList());
+		menuListeners(catalogEvent); // get user input and set chosenElement.
+	}
+
+	std::ostringstream oss;
+	oss << "PIRClient: Retrieved file is nbr " + (chosenElement+1);
+	oss << + ", \"" + catalog.getFileName(chosenElement) +  "\"";
+
+	MessageEvent messageEvent(oss.str());
+	messageListeners(messageEvent);
+}
+
+/**
+ *  Set the query generator and launch parallely query generation and query upload.
+ **/
+void PIRClientSimple::startProcessQuery()
+{
+	PIRQueryGenerator_internal queryGen(pirParams, *cryptoMethod);
+
+	queryGen.setChosenElement(chosenElement);
+
+
+  if(no_pipeline_mode) {
+    std::cout << "PIRClient: Calling query generation and upload without pipelining" << std::endl;
+    queryGen.generateQuery(); 
+  } else {
+    queryGen.startGenerateQuery();
+  }
+
+	uploadWorker(queryGen);
+}
+void sleepForBytes(unsigned int bytes) {
+#ifdef UPLOAD_LIMIT
+	uint64_t seconds=(bytes*8)/UPLOAD_LIMIT;
+	uint64_t nanoseconds=((((double)bytes*8.)/(double)UPLOAD_LIMIT)-(double)seconds)*1000000000UL;
+	  struct timespec req={0},rem={0};
+	  req.tv_sec=seconds;
+	  req.tv_nsec=nanoseconds;
+    double st=omp_get_wtime();
+	  nanosleep(&req,&rem);
+#endif
+}
+/**
+ *  Upload query to the server et delete its parts from the shared query queue.
+ *  Exception :
+ *  - Stop the programme if any network trouble.
+ **/
+void PIRClientSimple::uploadWorker(PIRQueryGenerator_internal& queryGen)
+{
+	unsigned int size = 0;
+	char *tmp;
+	try 
+	{
+		for (unsigned int j = 1 ; j <= pirParams.d ; j++)
+		{
+			size = cryptoMethod->getPublicParameters().getQuerySizeFromRecLvl(j) / GlobalConstant::kBitsPerByte;
+
+			for (unsigned int i = 0 ; i < pirParams.n[j - 1] ; i++)
+			{
+				tmp = queryGen.queryBuffer.pop_front();
+				write(socket_up, boost::asio::buffer(tmp, size));
+				free(tmp);
+#ifdef UPLOAD_LIMIT
+        sleepForBytes(size);
+#endif
+			}
+		}
+	} 
+	catch (const std::exception& ex) 
+	{
+		exitWithErrorMessage(__FUNCTION__, ex.what());
+	}
+
+	
+}
+
+/**
+ *  Sets reply extractpr and lauches parallely reply download and reply extraction.
+ **/
+void PIRClientSimple::startProcessResult()
+{
+	replyExt = new PIRReplyExtraction_internal(pirParams,*cryptoMethod);
+	replyExt->setFileParam(catalog.getFileName(chosenElement), catalog.getFileSize(chosenElement)); 
+
+  if(no_pipeline_mode)
+  {
+    std::cout << "PIRClient: Calling reply download, extraction and writting without pipelining" << std::endl;
+    downloadWorker(*replyExt);
+    replyExt->extractReply(catalog.getMaxFileSize()*pirParams.alpha, replyWriter.getClearDataQueue());
+    // Tell reply writer we finished the extraction
+    replyWriter.writeAggregatedFileSecurely(chosenElement, catalog);
+  }
+  else 
+  {
+	replyExt->startExtractReply(catalog.getMaxFileSize()*pirParams.alpha, replyWriter.getClearDataQueue());
+  
+  replyWriter.startFileWritting(chosenElement, catalog);
+	downloadWorker(*replyExt);
+  }
+}
+
+/**
+ *  Download reply from the server and stores it chunks in shared replies queue.
+ *  Exception :
+ *  - Stop the program if any network trouble.
+ **/
+void PIRClientSimple::downloadWorker(PIRReplyExtraction_internal& turlututu)
+{
+  using  namespace GlobalConstant;
+  unsigned int i,  ciph_siz = cryptoMethod->getPublicParameters().getCiphBitsizeFromRecLvl(pirParams.d)/kBitsPerByte;
+
+  double paquet_nbr = ceil(static_cast<double>(catalog.getMaxFileSize()*pirParams.alpha) / double(cryptoMethod->getPublicParameters().getAbsorptionBitsize(0)/kBitsPerByte)); 
+
+#ifdef DEBUG
+  cout << "PIRClient: First layer nbr of ciphertexts is " << paquet_nbr << endl;
+#endif
+
+    for (unsigned int i = 1 ; i < pirParams.d; i++) paquet_nbr =  ceil(paquet_nbr * double(cryptoMethod->getPublicParameters().getCiphBitsizeFromRecLvl(i)/kBitsPerByte) / double(cryptoMethod->getPublicParameters().getAbsorptionBitsize(i) / kBitsPerByte));
+
+	char* buf;
+
+#ifdef DEBUG
+  cout << "PIRClient: getMaxFileSize=" << catalog.getMaxFileSize() << " alpha=" << pirParams.alpha << " getAbsorptionBitsize=" << double(cryptoMethod->getPublicParameters().getAbsorptionBitsize(0))/*kBitsPerByte);*/ << endl;
+  cout << "PIRClient: Last layer nbr of ciphertexts is " << paquet_nbr << endl;
+  cout << "PIRClient: File size of the chosen element is " << catalog.getFileSize(chosenElement) << endl;
+	cout << "PIRClient: Ciphertext bytesize is " << ciph_siz << endl;
+#endif
+
+	try
+	{
+		for (i = 0 ; i < paquet_nbr ; i++)
+		{
+			buf = (char*) malloc(ciph_siz * sizeof(char));
+			read(socket_up,boost::asio::buffer(buf, ciph_siz));
+			replyExt->repliesBuffer.push(buf);
+		}
+	}
+	catch (const std::exception& ex) 
+	{
+#ifdef DEBUG
+    cerr << "PIRReplyWriter: Number of downloaded chunks: " << i << "/" << paquet_nbr << endl;
+#endif
+		exitWithErrorMessage(__FUNCTION__, ex.what());
+    return;
+	}
+  writeWarningMessage(__FUNCTION__, "done.");
+}
+
+/**
+ *  Sets the chosen element.
+ **/
+void PIRClientSimple::setChosenElement(uint64_t choice)
+{
+	chosenElement = choice;
+}
+
+//void PIRClientSimple::setPIRParameters(PIRParameters& pirParameters)
+//{
+//  pirParams.alpha = pirParameters.alpha;
+//  pirParams.d = pirParameters.d;
+//  memcpy(pirParams.n, pirParameters.n, MAX_REC_LVL);
+//  pirParams.r;
+//}
+
+/**
+ *	Add a new message listener.
+ *	Param :
+ *		- messageListener::slot_function_type subscriber, a message listener to add.
+ **/
+boost::signals2::connection PIRClientSimple::addMessageListener(messageListener::slot_function_type subscriber)
+{
+	return messageListeners.connect(subscriber);
+}
+
+/**
+ *	Add a new menu listener.
+ *	Param :
+ *		- menuListener::slot_function_type subscriber, a menu listener to add.
+ **/
+boost::signals2::connection  PIRClientSimple::addMenuListener(menuListener::slot_function_type subscriber)
+{
+	return menuListeners.connect(subscriber);
+}
+
+/**
+ *	Add a new wite listener
+ *	Param :
+ *		- writeListener::slot_function_type subscriber, a write listener to add.
+ **/
+boost::signals2::connection PIRClientSimple::addWriteListener(writeListener::slot_function_type subscriber)
+{
+	return writeListeners.connect(subscriber);
+}
+
+void PIRClientSimple::exitWithErrorMessage(string s1, string s2)
+{
+	writeErrorMessage(s1 ,s2);
+	socket_up.close();
+	exit(errno);
+}
+
+/**
+ *	Send ERROR message to listeners
+ *	Params :
+ *		- string funcName :  usually the function name who throw the error message ;
+ *		- string message  :  message to show.
+ **/
+void PIRClientSimple::writeErrorMessage(string funcName, string message)
+{
+	MessageEvent event(ERROR, message, funcName);
+	messageListeners(event);	
+}
+
+/**
+ *	Send WARNING message to listeners
+ *	Params :
+ *		- string funcName :  usually the function name who throw the warning message ;
+ *		- string message  :  message to show.
+ **/
+void PIRClientSimple::writeWarningMessage(string funcName, string message) 
+{
+	MessageEvent event(WARNING, message, funcName);
+	messageListeners(event);
+}
+
+void PIRClientSimple::no_pipeline(bool b) 
+{
+  no_pipeline_mode = b;
+}

+ 122 - 0
apps/client/PIRClient.hpp

@@ -0,0 +1,122 @@
+/* Copyright (C) 2014 Carlos Aguilar Melchor, Joris Barrier, Marc-Olivier Killijian
+ * This file is part of XPIR.
+ *
+ *  XPIR 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  XPIR 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 XPIR.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef DEF_PIRCLIENT
+#define DEF_PIRCLIENT
+//#define DEBUG
+#include <string>
+#include <iostream>
+
+#include <boost/asio.hpp>
+#include <boost/thread.hpp>
+#include <boost/signals2.hpp>
+
+#include "DESC.hpp"
+
+#include "crypto/NFLLWE.hpp"
+
+#include "pir/queryGen/PIRQueryGenerator_internal.hpp"
+#include "pir/PIRParameters.hpp"
+#include "pir/replyExtraction/PIRReplyExtraction_internal.hpp"
+#include "pir/replyExtraction/PIRReplyWriter.hpp"
+
+#include "apps/optim/PIROptimizer.hpp"
+
+#include "pir/events/WriteEvent.hpp"
+#include "pir/events/CatalogEvent.hpp"
+#include "pir/events/MessageEvent.hpp"
+
+#include "pir/PIRParametersExchangeMethods.hpp"
+#include "pir/GlobalConstant.hpp"
+
+typedef boost::signals2::signal<void (MessageEvent&)>   messageListener;
+typedef boost::signals2::signal<void (CatalogEvent&)>   menuListener;
+typedef boost::signals2::signal<void (WriteEvent&)>     writeListener;
+
+
+struct ClientParams 
+{
+  // Networking parameters
+  string server_ip;
+  int port; 
+
+  // Interface params
+  bool autochoice;
+  bool verboseoptim;
+  bool dontwrite;
+
+  // Dry-run mode
+  bool dryrunmode;
+};
+
+class PIRClientSimple
+{
+  private:
+    PIRReplyExtraction_internal *replyExt;
+    ClientParams clientParams;
+    FixedVars fixedVars;
+    OptimVars optimum;
+    HomomorphicCrypto* cryptoMethod;
+    messageListener messageListeners; 
+    menuListener 		menuListeners;
+    writeListener		writeListeners;
+    boost::asio::ip::tcp::socket socket_up;
+  
+    PIRReplyWriter replyWriter;
+    PIRParameters pirParams;
+    DESC catalog;
+    short exchange_method;
+
+    void uploadWorker(PIRQueryGenerator_internal& queryGen);
+    void downloadWorker(PIRReplyExtraction_internal& replyExt);
+    void sendPirParams();
+    void rcvPirParams();
+
+    void exitWithErrorMessage(string s1, string s2);
+    void writeErrorMessage(string funcName, string message);
+    void writeWarningMessage(string funcName, string message);
+
+    bool no_pipeline_mode;
+    uint64_t chosenElement;
+
+  public:
+    PIRClientSimple( boost::asio::io_service& ios, ClientParams params, FixedVars vars);
+    ~PIRClientSimple();
+
+    void connect();
+    void chooseFile();
+    void rcvPIRParamsExchangeMethod();
+    void processPIRParams();
+    void downloadCatalog();
+    void optimize();
+    void sendCryptoParams(bool paramsandkey);
+    void rcvCryptoParams();
+    void processCryptoParams(); 
+    void startProcessQuery();
+    void startProcessResult();
+
+    void setChosenElement(uint64_t choice);
+    void joinAllThreads();
+    void no_pipeline(bool b);
+
+    /*Add Observers*/
+    boost::signals2::connection addMessageListener(messageListener::slot_function_type subscriber);
+    boost::signals2::connection addMenuListener(menuListener::slot_function_type subscriber);
+    boost::signals2::connection addWriteListener(writeListener::slot_function_type subscriber);
+};
+
+#endif

+ 111 - 0
apps/client/PIRClientLog.cpp

@@ -0,0 +1,111 @@
+/* Copyright (C) 2014 Carlos Aguilar Melchor, Joris Barrier, Marc-Olivier Killijian
+ * This file is part of XPIR.
+ *
+ *  XPIR 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  XPIR 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 XPIR.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "PIRClientLog.hpp"
+
+PIRClientLog::PIRClientLog(PIRController* controller_) :
+	PIRView(controller_),
+	file("clientError.log", std::ios::app)
+{}
+
+PIRClientLog::~PIRClientLog()
+{
+	file.close();
+}
+
+const std::string PIRClientLog::getCurrentTime()
+{
+    time_t     now = time(0);
+    struct tm  tstruct;
+    char       buf[80];
+
+    tstruct = *localtime(&now);
+    strftime(buf, sizeof(buf), "%Y-%m-%d.%X", &tstruct);
+
+    return buf;
+}
+
+/**
+ *	Called by the model when a information as to be displayed.
+ *	Param :
+ *		- MessageEvent& event : the message to write. 
+ **/
+void PIRClientLog::messageUpdate(MessageEvent& event)
+{
+	std::string m;
+	switch(event.getMessageType())
+	{
+		case WARNING :
+			{
+				m = "Warning";
+				break;
+			}
+		case ERROR :
+			{
+				m = "Message";
+				break;
+			}
+		case CHOICE:
+			{
+				m = "Choice ";
+				break;
+			}
+		case DEFAULT:
+			{
+				m = "Default";
+				break;
+			}
+		case RETRY:
+			{
+				m = "Retry";
+				break;
+			}
+	}
+	writeMessage(m, event);
+}
+/**
+ *	Called by the model when catalog is entierely received.
+ *	Param :
+ *		- CatalogEvent& event : new catalog event to write.
+ **/
+void PIRClientLog::catalogUpdate(CatalogEvent& event)
+{
+	file << "Proposed files : " << getCurrentTime() << std::endl;
+	file << "---------------  " << std::endl;
+	const	std::vector<std::string>& fileList = event.getCatalog();
+
+	for (unsigned int i = 0 ; i < fileList.size() ; i++)
+	{
+		file << fileList.at(i) << " ";
+		if (i+1 % 10 == 0)
+			file << std::endl;
+	}
+	file << std::endl;
+	file << "---------------  " << std::endl;
+	std::flush(file);
+}
+void PIRClientLog::writeUpdate(WriteEvent& event)
+{
+	event.getSizeToWrite();
+}
+
+void PIRClientLog::writeMessage(std::string type, MessageEvent& event)
+{
+	file << getCurrentTime() << " " << type << " : " << event.getMessage() << " : " << event.getInfo() << std::endl;	
+	std::flush(file);
+}
+

+ 42 - 0
apps/client/PIRClientLog.hpp

@@ -0,0 +1,42 @@
+/* Copyright (C) 2014 Carlos Aguilar Melchor, Joris Barrier, Marc-Olivier Killijian
+ * This file is part of XPIR.
+ *
+ *  XPIR 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  XPIR 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 XPIR.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef DEF_PIRCLIENTLOG
+#define DEF_PRICLIENTLOG
+
+#include <fstream>
+
+#include "PIRView.hpp"
+
+class PIRClientLog : public PIRView
+{
+	private:
+		std::ofstream file;
+
+		void writeMessage(std::string, MessageEvent& event);
+    const std::string getCurrentTime();
+	
+	public:
+		PIRClientLog(PIRController* controller_);
+		~PIRClientLog();
+
+		void messageUpdate(MessageEvent& event);
+		void catalogUpdate(CatalogEvent& event);
+		void writeUpdate(WriteEvent& 		 event);
+};
+
+#endif

+ 69 - 0
apps/client/PIRController.cpp

@@ -0,0 +1,69 @@
+/* Copyright (C) 2014 Carlos Aguilar Melchor, Joris Barrier, Marc-Olivier Killijian
+ * This file is part of XPIR.
+ *
+ *  XPIR 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  XPIR 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 XPIR.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "PIRController.hpp"
+#include "PIRClient.hpp"
+
+/**
+ *	Class constructor.
+ *	Param :
+ *		- pirClient_ptr model_ptr_ : PIRClient shared_ptr.
+ **/
+PIRController::PIRController(PIRClientSimple& model_ptr_):
+  model_ptr(model_ptr_),
+  view_cli(this),
+  logger(this)
+{
+  addListenersToModel();
+}
+
+/**
+ *	Add listners (attribute of PIRController) to the model (model_ptr).
+ **/
+void PIRController::addListenersToModel()
+{
+  connectionMessage.push_back(model_ptr.addMessageListener(boost::bind(&PIRView::messageUpdate, &view_cli, _1)));
+  connectionMessage.push_back(model_ptr.addMessageListener(boost::bind(&PIRView::messageUpdate, &logger, _1)));
+
+  connectionMenu.push_back(model_ptr.addMenuListener(boost::bind(&PIRView::catalogUpdate, &view_cli, _1))); 
+  connectionMenu.push_back(model_ptr.addMenuListener(boost::bind(&PIRView::catalogUpdate, &logger, _1)));
+
+  connectionWrite.push_back(model_ptr.addWriteListener(boost::bind(&PIRView::writeUpdate, &view_cli, _1))); 
+}
+
+
+/**
+ *	Notify model of a client choice.
+ *	Param :
+ *		- int c : int input.
+ **/
+void PIRController::notifyClientChoice(int c)
+{
+  model_ptr.setChosenElement(c);
+}
+
+PIRController::~PIRController()
+{
+  for (auto &messageView : connectionMessage)
+    messageView.disconnect();
+
+  for (auto &menuView : connectionMenu)
+    menuView.disconnect();
+
+  for (auto &writeView : connectionWrite)
+    writeView.disconnect();
+}

+ 47 - 0
apps/client/PIRController.hpp

@@ -0,0 +1,47 @@
+/* Copyright (C) 2014 Carlos Aguilar Melchor, Joris Barrier, Marc-Olivier Killijian
+ * This file is part of XPIR.
+ *
+ *  XPIR 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  XPIR 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 XPIR.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef DEF_PIRCONTROLLER
+#define DEF_PIRCONTROLLER
+
+#include <vector>
+
+#include "PIRViewCLI.hpp"
+#include "PIRClientLog.hpp"
+
+class PIRClientSimple;
+
+class PIRController
+{
+	private:
+		PIRClientSimple& 	model_ptr;
+		PIRViewCLI 				view_cli;
+		PIRClientLog			logger;
+
+		std::vector<boost::signals2::connection> connectionMessage, connectionMenu, connectionWrite;
+	
+	public:
+			PIRController(PIRClientSimple& model_ptr_);
+			~PIRController();
+
+			void addListenersToModel();
+			void notifyClientChoice(char c);
+			void notifyClientChoice(int  c);
+
+};
+
+#endif

+ 33 - 0
apps/client/PIRView.cpp

@@ -0,0 +1,33 @@
+/* Copyright (C) 2014 Carlos Aguilar Melchor, Joris Barrier, Marc-Olivier Killijian
+ * This file is part of XPIR.
+ *
+ *  XPIR 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  XPIR 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 XPIR.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "PIRView.hpp"
+#include "PIRController.hpp"
+
+/**
+ *	Class constructor.
+ *	Param : 
+ *		- PIRController* controller_ , a PIRController pointer.
+ **/
+PIRView::PIRView(PIRController* controller_) :
+	controller(controller_)
+{}
+
+PIRView::~PIRView()
+{}
+
+

+ 51 - 0
apps/client/PIRView.hpp

@@ -0,0 +1,51 @@
+/* Copyright (C) 2014 Carlos Aguilar Melchor, Joris Barrier, Marc-Olivier Killijian
+ * This file is part of XPIR.
+ *
+ *  XPIR 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  XPIR 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 XPIR.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef DEF_PIRVIEW
+#define DEF_PIRVIEW
+
+#include <vector>
+#include <string>
+
+#include <boost/signals2.hpp>
+
+#include "pir/events/MessageEvent.hpp"
+#include "pir/events/CatalogEvent.hpp"
+#include "pir/events/WriteEvent.hpp"
+
+
+class PIRController;
+
+class PIRView
+{
+	private:
+		 boost::signals2::connection m_connection, m_connectionMenu;
+	
+	protected:
+		 PIRController* controller;
+
+	public:
+		PIRView(PIRController* controller_);
+		virtual ~PIRView();
+
+		virtual void messageUpdate(MessageEvent& event)=0;
+		virtual void catalogUpdate(CatalogEvent& event)=0;
+		virtual void writeUpdate(WriteEvent& 		 event)=0;
+
+};
+
+#endif

+ 162 - 0
apps/client/PIRViewCLI.cpp

@@ -0,0 +1,162 @@
+/* Copyright (C) 2014 Carlos Aguilar Melchor, Joris Barrier, Marc-Olivier Killijian
+ * This file is part of XPIR.
+ *
+ *  XPIR 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  XPIR 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 XPIR.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "PIRViewCLI.hpp"
+#include "PIRController.hpp"
+
+/**
+ *	Class constructor.
+ *	Param :
+ *
+ **/
+PIRViewCLI::PIRViewCLI(PIRController* controller_) :
+	PIRView(controller_)
+{}
+
+/**
+ *	Message notification, display event content.
+ *	Param :
+ *		- MessageEvent& event : MessageEvent reference to display.
+ **/
+void PIRViewCLI::messageUpdate(MessageEvent& event)
+{
+	if(event.getMessageType() == RETRY){
+		getUserInputRetry();
+	}
+	else if(event.getMessageType() == DEFAULT){
+		std::cout << event.getMessage() << std::endl; 
+	}
+	else
+	{
+		std::string color = (event.getMessageType() == WARNING) ? ORANGE : RED;
+		std::cout << BOLD  << event.getInfo() << " : " << RESET_COLOR << color << event.getMessage() << RESET_COLOR << std::endl;
+	}
+}
+
+/**
+ *	Catalog notification, display catalog content in a framed list.
+ *	Param :
+ *		- CatalogEvent& event : CatalogEvent reference to display.
+ **/
+void PIRViewCLI::catalogUpdate(CatalogEvent& event)
+{
+	using namespace std;
+	cout << endl;
+	cout << "##############################################" << endl;
+	cout << "#                                            #" << endl;
+	cout << "# Connection established                     #" << endl;
+	cout << "#                                            #" << endl;
+	cout << "##############################################" << endl;
+	cout << "#                                            #" << endl;
+	cout << "# File List :                                #" << endl;
+	cout << "# °°°°°°°°°°°                                #" << endl;
+	cout << "#                                            #" << endl;
+
+	for (unsigned int i = 0 ; i < event.getCatalog().size() ; i++) 
+	{
+		cout << "# " << i+1 << ") " << event.getCatalog().at(i);
+
+		for(unsigned int j = 0; j < 40 - event.getCatalog().at(i).length(); j++)
+			cout << " ";
+
+		cout << "#" << endl;
+	}
+
+	cout << "#                                            #" << endl;
+	cout << "##############################################" << endl;
+	cout << "#                                            #" << endl;
+	cout << "# Which file do you want ?                   #" << endl;
+	getUserInputFile(event.getCatalog().size()) ;
+}
+
+/**
+ *	Writing notification, used when the client wants to display the writing state of the files.
+ *	Param :
+ *		- WriteEvent& event : WriteEvent reference.
+ **/
+void PIRViewCLI::writeUpdate(WriteEvent& event)
+{
+	using namespace std;
+
+	std::cout << "\033[1GPIRReplyWriter: Remaning Bytes to write : " << event.getSizeToWrite() -  event.getWrittenSize() << "                                  \033[5G"  << "\xd"<< std::flush;
+
+	if(event.getSizeToWrite() == event.getWrittenSize())
+	{
+		cout << endl << endl <<"\t## SUCESS ! ##" << endl;
+		cout << "\t   °°°°°°" << endl;
+	}
+}
+
+/**
+ *	Get user input for retry questions :
+ *	Param :
+ *		- const std::string& message : message to display.
+ **/
+void PIRViewCLI::getUserInputRetry()
+{
+	using namespace std;	
+	char choice;
+	cout << "Enable de reach the server, would you like to retry ? (Y/n) : ";
+
+retrying:
+	cin.clear();
+	choice = cin.get();
+
+	if (choice == 'N'||choice == 'n') {
+		controller->notifyClientChoice(false);
+	}
+	else if (choice == 'Y' || choice == 'y'|| choice == '\n') {
+		controller->notifyClientChoice(true);
+	}	
+	else
+	{
+		cout << "Bad input, retry : ";
+		cin.ignore(1);
+		goto retrying;
+	}
+}
+
+/**
+ *	Get user choice, used with updateCatalog method.
+ *	Param :
+ *		- int maxVulue : maximum value that the user can enter.
+ **/
+void PIRViewCLI::getUserInputFile(int maxValue)
+{
+	using namespace std;
+	int choice  = -1;
+	bool retry;
+	MessageEvent event(WARNING);
+	
+	do
+	{
+		retry = false;
+		cin >> choice ;
+		cin.clear();
+		cin.get();
+		
+		if (choice > maxValue || choice <= 0)
+		{
+			retry = true;
+			event.setMessage("This file doesn't exist, retry :");
+			messageUpdate(event);
+		}
+	}while(retry);
+
+	controller->notifyClientChoice(--choice);
+}
+

+ 48 - 0
apps/client/PIRViewCLI.hpp

@@ -0,0 +1,48 @@
+/* Copyright (C) 2014 Carlos Aguilar Melchor, Joris Barrier, Marc-Olivier Killijian
+ * This file is part of XPIR.
+ *
+ *  XPIR 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  XPIR 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 XPIR.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef DEF_PIRCLIENTCLI
+#define DEF_PIRCLIENTCLI
+
+#include <boost/signals2.hpp>
+#include <string>
+#include <iostream>
+
+#include "PIRView.hpp"
+
+#define RESET_COLOR "\033[m"
+#define RED "\033[31m"
+#define BOLD "\033[1;30m"
+#define ORANGE "\033[33m"
+#define DEFAULT_BOX_SIZE 24
+
+class PIRController;
+
+class PIRViewCLI : public PIRView
+{
+	public:
+		PIRViewCLI(PIRController* controller_);
+		
+		void messageUpdate(MessageEvent& event);
+		void catalogUpdate(CatalogEvent& event);
+		void writeUpdate(WriteEvent& 		 event);
+
+		void getUserInputRetry();
+		void getUserInputFile(int maxValue);
+};
+
+#endif

+ 418 - 0
apps/client/main.cpp

@@ -0,0 +1,418 @@
+/* Copyright (C) 2014 Carlos Aguilar Melchor, Joris Barrier, Marc-Olivier Killijian
+ * This file is part of XPIR.
+ *
+ *  XPIR 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  XPIR 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 XPIR.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "main.hpp"
+
+// Client constants
+static const std::string DEFAULT_IP("127.0.0.1");
+static const int DEFAULT_PORT = 1234;
+static const bool DEFAULT_AUTOCHOICE = false;
+
+// Optimizer constants
+static const int DEFAULT_SECURITY = 80;
+static const unsigned long DEFAULT_N = 1000;
+static const unsigned int DEFAULT_L = 24000000;
+static const unsigned int DEFAULT_TUPC = 100000000;
+static const unsigned int DEFAULT_TDOC = 100000000;
+static const unsigned int DEFAULT_K = 80;
+static const unsigned int DEFAULT_ALPHAMAX = 0; // 0 means no limit
+static const unsigned int DEFAULT_DMAX = 4;
+static const unsigned int DEFAULT_DMIN = 1; 
+static const FitnessType DEFAULT_FITNESSMETHOD = MAX;
+static const std::string DEFAULT_CRYPTO_PARAMS("LWE:80:1024:60:22");
+
+
+//Global vars
+string fileToOptimizeFrom;
+bool no_pipeline = false;
+
+void sighandler(int sig_num)
+{
+  FixedVars fixedVars;
+  cerr.flush();
+  if(sig_num == SIGPIPE)
+    cerr << "Broken pipe detected";
+
+  cerr << endl << "Exiting client..." << endl << endl;
+  exit(EXIT_SUCCESS);       
+}
+
+
+void defineClientOptions(ClientParams* paramsPtr, po::options_description* odptr){
+  odptr->add_options()
+    ("help,h", 
+     "help message") 
+    
+    ("serverip,ip", 
+     po::value<string>(&paramsPtr->server_ip)->default_value(DEFAULT_IP), 
+     "PIR server IP" )
+
+    ("port,p", 
+     po::value<int>(&paramsPtr->port)->default_value(DEFAULT_PORT), 
+     "PIR server port")
+    
+    ("autochoice,c", 
+     "Auto-choose the first file")
+    
+    ("dry-run", 
+     "Enable dry-run mode")
+    
+    ("verbose-optim", 
+     "Ask the optimizer to be more verbose")
+    
+    ("dont-write", 
+     "Don't write result to a file")
+    
+    ("file,f", 
+     po::value<std::string>(&fileToOptimizeFrom), 
+     "Use a config file to test different optimizations in dry-run mode (see sample.conf)"); 
+}
+
+
+void defineOptimizerOptions(FixedVars* varsPtr, po::options_description* odptr){
+  odptr->add_options()
+    ("file-nbr,n", 
+     po::value<uint64_t>(), 
+     "Used in dry-run mode only: Number of database elements" )
+
+    ("file-size,l", 
+     po::value<uint64_t>(), 
+     "Used in dry-run mode only: Database element size in bits")
+    
+    ("upload,up", 
+     po::value<double>(),  
+     "Force client upload speed in bits/s (bandwith test will be skipped)")
+    
+    ("download,down", 
+     po::value<double>(), 
+     "Force client download speed in bits/s (bandwidth test will be skipped)")
+    
+    ("crypto-params,r", 
+     po::value<string>(&varsPtr->manual_crypto_params), 
+     "Set cryptographic parameteres manually")
+    
+    ("security,k", 
+     po::value<unsigned int>(&varsPtr->k)->default_value(DEFAULT_SECURITY), 
+     "Security bits wanted")
+    
+    ("dmin", 
+     po::value<unsigned int>(&varsPtr->dMin)->default_value(DEFAULT_DMIN), 
+     "Min dimension value to test")
+    
+    ("dmax", 
+     po::value<unsigned int>(&varsPtr->dMax)->default_value(DEFAULT_DMAX), 
+     "Max dimension value to test")
+    
+    ("alphaMax,a", 
+     po::value<unsigned int>(&varsPtr->alphaMax)->default_value(DEFAULT_ALPHAMAX), 
+     "Max aggregation value to test (1 = no aggregation, 0 = no limit)")
+    
+    ("fitness,x",
+     po::value<int>((int*)&varsPtr->fitness)->default_value((int)DEFAULT_FITNESSMETHOD),
+     "Set fitness method to: \n0=SUM Sum of the times on each task\n1=MAX Max of server times + Max of client times\n2=CLOUD Dollars in a cloud model (see sourcecode)");    
+}
+
+
+void defineHiddenOptions(FixedVars* varsPtr, po::options_description* odptr){
+  odptr->add_options()
+    ("no-pipeline", "No pipeline mode\n")
+
+    ("reclvl", 
+     po::value<unsigned int>(), 
+     "Number of dimension used for database representation"); 
+}
+
+
+void processOptions(FixedVars* varsPtr, ClientParams* paramsPtr, po::variables_map vm){
+
+  // Client options
+  if(vm.count("serverip")) 
+  {
+    std::cout << "CLI: Server ip set to " <<  paramsPtr->server_ip << std::endl;
+  }
+  
+  if(vm.count("port")) 
+  {
+    std::cout << "CLI: Upload port set to " << paramsPtr->port << std::endl;
+  }
+  
+  if(vm.count("autochoice")) 
+  {
+    std::cout << "CLI: Auto-choice activated" << std::endl;
+    paramsPtr->autochoice = true;
+  }
+  
+  if(vm.count("dry-run")) 
+  {
+    std::cout << "CLI: Dry-run mode activated" << std::endl;
+    paramsPtr->dryrunmode = true;
+    varsPtr->n = DEFAULT_N;
+    varsPtr->l = DEFAULT_L;
+    varsPtr->Tupc = DEFAULT_TUPC;
+    varsPtr->Tdos = DEFAULT_TUPC;
+    varsPtr->Tdoc = DEFAULT_TDOC;
+    varsPtr->Tups = DEFAULT_TDOC;
+    std::cout << "CLI: Setting default values for dry-run mode (a thousand mp3 files, 100MBit/s connection)" <<std::endl;
+  }
+
+  if(vm.count("verbose-optim")) 
+  {
+    std::cout << "CLI: Will ask the optimizer to be more verbose" << std::endl;
+    paramsPtr->verboseoptim = true;
+  }
+
+
+  if(vm.count("dont-write")) 
+  {
+    std::cout << "CLI: Will ask PIRReplyWriter not to write to a file" << std::endl;
+    paramsPtr->dontwrite = true;
+  }
+  else paramsPtr->dontwrite = false;
+
+  // Optimizer options
+  if(vm.count("file-nbr")) 
+  {
+    if(vm.count("dry-run"))
+    {
+      varsPtr->n = vm["file-nbr"].as<uint64_t>();
+      std::cout << "CLI: Changing number of database elements to "\
+        << varsPtr->n << std::endl;
+    } 
+    else 
+    {
+      std::cout << "CLI: Option -n,--file-nbr ignored as we are not in dry-run mode"\
+        << std::endl; 
+    }
+  }
+
+  if(vm.count("file-size")) {
+    if(vm.count("dry-run"))
+    {
+      varsPtr->l = vm["file-size"].as<uint64_t>();
+      std::cout << "CLI: Changing database element size to " << varsPtr->l <<std::endl;
+    }
+    else
+    {
+      std::cout << "CLI: Option -l,--file-size ignored as we are not in dry-run mode"
+        << std::endl; 
+    }
+  }
+
+  if (vm.count("upload"))
+  {
+    varsPtr->Tupc = vm["upload"].as<double>();
+    varsPtr->Tdos = varsPtr->Tupc;
+    cout << "CLI: Upload speed forced to "<< varsPtr->Tupc << endl;
+  }
+  
+  if (vm.count("download"))
+  {
+    varsPtr->Tdoc = vm["download"].as<double>();
+    varsPtr->Tups = varsPtr->Tdoc;
+    cout << "CLI: Download speed forced to "<< varsPtr->Tdoc << endl;
+  }
+  
+  if(vm.count("crypto-params")) 
+  {
+    std::cout << "CLI: Crypto parameters set to " << varsPtr->manual_crypto_params <<  std::endl;
+    std::vector<std::string> fields;
+    boost::algorithm::split(fields, varsPtr->manual_crypto_params, boost::algorithm::is_any_of(":"));
+    if (fields.size()>1 && atoi(fields[1].c_str()) > 0)
+    {
+      varsPtr->k = atoi(fields[1].c_str());
+    }
+    if (fields.size()>4)
+    { 
+      std::cout << "CLI: WARNING Absorption size will be overriden by the optimizer" << varsPtr->manual_crypto_params <<  std::endl;
+      
+      varsPtr->k = 0;
+    } 
+  }
+
+  if(vm.count("security")) 
+  {
+    std::cout << "CLI: Security set to " << varsPtr->k <<  std::endl;
+  }
+
+  if (vm.count("dmin")) 
+  {
+    cout << "CLI: Minimum recursion level set to "<< varsPtr->dMin << endl;
+  }
+  
+  if (vm.count("dmax")) 
+  {
+    cout << "CLI: Maximum recursion level set to "<< varsPtr->dMax << endl;
+  }
+  
+  if(vm.count("alphaMax")) 
+  {
+    varsPtr->alphaMax = vm["alphaMax"].as<unsigned int>();
+    cout << "CLI: Max aggregation set to "<< varsPtr->alphaMax << endl;
+  }
+  
+  if(vm.count("fitness")) 
+  {
+    cout << "CLI: Fitness method set to "<< varsPtr->fitness << endl;
+  }   
+  
+  // Hidden options
+  if (vm.count("reclvl")) 
+  {
+    varsPtr->dMax = vm["reclvl"].as<unsigned int>(); 
+    varsPtr->dMin = vm["reclvl"].as<unsigned int>(); 
+    cout << "CLI: Recursion level forced to "<< varsPtr->dMax << endl;
+  }
+  
+  if (vm.count("no-pipeline"))
+  {
+    std::cout << "CLI: WARNING no pipeline mode activated" << std::endl;
+    no_pipeline = true;
+  }
+}
+
+
+
+int main(int argc, char** argv) 
+{
+  boost::asio::io_service ios;
+  
+  // Vars for the optimizer (and pot. client)
+  FixedVars fixedVars = {}; // Inits to default value all fields
+  
+  // Vars for the client only
+  ClientParams clientParams = {}; // Same here
+
+  // Add and define options
+  po::options_description od("Client options");
+  po::options_description optimizeropts("Optimizer options");
+  po::options_description hidden("Hidden options");
+  defineOptimizerOptions(&fixedVars, &optimizeropts);
+  defineClientOptions(&clientParams, &od);
+  defineHiddenOptions(&fixedVars, &hidden);
+
+  // Set which options are visible and which not
+  po::options_description visible;
+  visible.add(od).add(optimizeropts);
+  po::options_description all;
+  all.add(visible).add(hidden);
+  po::variables_map vm;
+
+  // Parse options from command line
+  try {
+    po::store(po::parse_command_line(argc, argv, all), vm);
+  }
+  catch (const std::exception& ex) 
+  {
+    std::cout << "CLI: Error checking program options: " << ex.what() << std::endl;
+    std::cout << visible << std::endl;
+    return 1;
+  }
+  po::notify(vm);
+
+  // Show usage help if requested
+  if(vm.count("help")) {
+    std::cout << visible << endl;
+    return 0;
+  }
+
+  // Set variables according to options
+  processOptions(&fixedVars, &clientParams, vm);
+ 
+  
+  // If we are on dry-run mode run only the optimizer not the client
+  if(vm.count("dry-run"))
+  {
+    std::cout << "CLI: Dry-run mode activated" << std::endl;
+
+    // The optimizer connects to the same PIR server but on a higher port for 
+    // optimization related exchanges
+    PIROptimizer optimizer(clientParams.server_ip, clientParams.port, fixedVars.fitness);
+    
+    if (vm.count("file"))
+    {
+      int experience_nbr = OptimService::getNumberOfExperiences(fileToOptimizeFrom);
+      if(experience_nbr == -1)
+      {
+        cout << "CLI: Unable to open : " << fileToOptimizeFrom << " aborting" << endl;
+        cout << "CLI: Try exp/sample.conf to test a predefined set of configurations" << endl;
+        return 1;
+      }
+      for (int exp_i = 0 ; exp_i <= experience_nbr ; exp_i++)
+      {
+        OptimService::readTestValues(exp_i, fixedVars, fileToOptimizeFrom);
+        OptimService::writeHeadFile(exp_i, fixedVars);
+        optimizer.optimize(fixedVars, exp_i);
+      }
+    }
+    else
+    {
+      cout << "CLI: Default example : A thousand mp3 files, ADSL, no aggregation, k=80" << endl;
+      cout << "CLI: n : " << fixedVars.n << " l : " << fixedVars.l;
+      cout << "CLI: Tupc : " << fixedVars.Tupc << " Tdoc : " << fixedVars.Tdoc << endl;
+
+      OptimService::writeHeadFile(0, fixedVars);
+      optimizer.optimize(fixedVars, 0);
+    }
+    return 0;
+  }
+
+  // If we are not in dry-run mode create client and controller
+  PIRClientSimple client(ios, clientParams, fixedVars);
+  PIRController controller(client);
+ 
+  // Set no_pipeline if needed
+  if(no_pipeline) client.no_pipeline(true);
+
+  // Start by connecting to the PIR server
+  client.connect();
+
+  // Downloads the file catalog
+  client.downloadCatalog();
+
+  // Get from the server whether we are in client-driven mode or not
+  client.rcvPIRParamsExchangeMethod();
+
+  // Use the optimizer to choose best parameters 
+  // (returns immediately in server-driven mode)
+  client.optimize();  
+
+  // Send PIR and cryptographic parameters to the server in client-driven mode
+  // and receive and process them in server-driven mode
+  client.processCryptoParams();
+  client.processPIRParams();
+
+  /*User chooses the file here.*/
+  client.chooseFile();
+  
+  double start = omp_get_wtime();
+  
+  
+  /* Asynchronously generate and send the request
+     separately in two threads*/
+  client.startProcessQuery();
+  /* Receive asynchronously the response from the server and
+     asynchronously writes it */