Added input ip to client
Added input ip to client
port merge conflict fixed