4 files changed, 4 insertions, 5 deletions
diff --git a/Sluift/SluiftClient.h b/Sluift/SluiftClient.h
index 8cc815d..39ff0a8 100644
--- a/Sluift/SluiftClient.h
+++ b/Sluift/SluiftClient.h
@@ -75,19 +75,18 @@ namespace Swift {
             Client* getClient() {
                 return client;
             }
 
             ClientOptions& getOptions() {
                 return options;
             }
 
             void connect();
-            void connect(const std::string& host, int port);
             void waitConnected(int timeout);
             bool isConnected() const;
             void setTraceEnabled(bool b);
 
             template<typename T>
                 Sluift::Response sendPubSubRequest(
                     IQ::Type type, const JID& jid, std::shared_ptr<T> payload, int timeout) {
                 return sendRequest(client->getPubSubManager()->createRequest(
                             type, jid, payload), timeout);
diff --git a/Sluift/SluiftComponent.cpp b/Sluift/SluiftComponent.cpp
index ee09380..74728ee 100644
--- a/Sluift/SluiftComponent.cpp
+++ b/Sluift/SluiftComponent.cpp
@@ -34,19 +34,19 @@ SluiftComponent::SluiftComponent(
     component->onMessageReceived.connect(boost::bind(&SluiftComponent::handleIncomingMessage, this, _1));
     component->onPresenceReceived.connect(boost::bind(&SluiftComponent::handleIncomingPresence, this, _1));
 }
 
 SluiftComponent::~SluiftComponent() {
     delete tracer;
     delete component;
 }
 
-void SluiftComponent::connect(const std::string& host, int port) {
+void SluiftComponent::connect(const std::string& host, unsigned short port) {
     if (component->isActive()) {
         throw Lua::Exception("Component is already connecting or connected");
     }
     disconnectedError = boost::optional<ComponentError>();
     component->connect(host, port);
 }
 
 void SluiftComponent::setTraceEnabled(bool b) {
     if (b && !tracer) {
diff --git a/Sluift/SluiftComponent.h b/Sluift/SluiftComponent.h
index 9fc7101..586a94e 100644
--- a/Sluift/SluiftComponent.h
+++ b/Sluift/SluiftComponent.h
@@ -57,19 +57,19 @@ namespace Swift {
                     const std::string& password,
                     NetworkFactories* networkFactories,
                     SimpleEventLoop* eventLoop);
             ~SluiftComponent();
 
             Component* getComponent() {
                 return component;
             }
 
-            void connect(const std::string& host, int port);
+            void connect(const std::string& host, unsigned short port);
             void waitConnected(int timeout);
             bool isConnected() const;
             void setTraceEnabled(bool b);
 
             template<typename REQUEST_TYPE>
             Sluift::Response sendRequest(REQUEST_TYPE request, int timeout) {
                 boost::signals2::scoped_connection c(request->onResponse.connect(
                         boost::bind(&SluiftComponent::handleRequestResponse, this, _1, _2)));
                 return doSendRequest(request, timeout);
diff --git a/Sluift/component.cpp b/Sluift/component.cpp
index f3c2e37..c1b1da4 100644
--- a/Sluift/component.cpp
+++ b/Sluift/component.cpp
@@ -90,25 +90,25 @@ static std::vector< std::shared_ptr<Payload> > getPayloadsFromTable(lua_State* L
     }
     lua_pop(L, 1);
     return result;
 }
 
 SLUIFT_LUA_FUNCTION(Component, async_connect) {
     SluiftComponent* component = getComponent(L);
 
     std::string host;
-    int port = 0;
+    unsigned short port = 0;
     if (lua_istable(L, 2)) {
         if (boost::optional<std::string> hostString = Lua::getStringField(L, 2, "host")) {
             host = *hostString;
         }
         if (boost::optional<int> portInt = Lua::getIntField(L, 2, "port")) {
-            port = *portInt;
+            port = boost::numeric_cast<unsigned short>(*portInt);
         }
     }
     component->connect(host, port);
     return 0;
 }
 
 SLUIFT_LUA_FUNCTION_WITH_HELP(
         Component, set_trace_enabled,
         "Enable/disable tracing of the data sent/received.\n\n.",