Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add addressFamily option to awa_clientd #4

Merged
merged 1 commit into from
Feb 25, 2016
Merged

Add addressFamily option to awa_clientd #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions core/src/client/lwm2m_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
************************************************************************************************************************/


#include <poll.h>
#include <stdio.h>
#include <getopt.h>
Expand Down Expand Up @@ -69,6 +68,7 @@ typedef struct
char * EndPointName;
char * BootStrap;
char * Logfile;
int AddressFamily;
const char * FactoryBootstrapInformation;
} Options;

Expand Down Expand Up @@ -173,8 +173,9 @@ static int Lwm2mClient_Start(Options * options)
Lwm2m_Info("LWM2M client - version %s\n", version);
Lwm2m_Info("LWM2M client - Local CoAP port %d\n", options->CoapPort);
Lwm2m_Info("LWM2M client - Local IPC port %d\n", options->IpcPort);
Lwm2m_Info("LWM2M client - Using IPv%d\n", options->AddressFamily == AF_INET ? 4 : 6);

CoapInfo * coap = coap_Init("0.0.0.0", options->CoapPort, (options->Verbose) ? DebugLevel_Debug : DebugLevel_Info);
CoapInfo * coap = coap_Init((options->AddressFamily == AF_INET) ? "0.0.0.0" : "::", options->CoapPort, (options->Verbose) ? DebugLevel_Debug : DebugLevel_Info);
if (coap == NULL)
{
Lwm2m_Error("Failed to initialise CoAP on port %d\n", options->CoapPort);
Expand Down Expand Up @@ -267,6 +268,7 @@ static void PrintUsage(void)

printf("Options:\n");
printf(" --port, -p : Local port number for CoAP communications\n");
printf(" --addressFamily : Address family for network interface. 4 for IPv4, 6 for IPv6\n");
printf(" --ipcPort, -i : port number for IPC communications\n");
printf(" --endPointName, -e : client end point name\n");
printf(" --bootstrap, -b : bootstrap server URI\n");
Expand All @@ -290,6 +292,7 @@ static int ParseOptions(int argc, char ** argv, Options * options)
static struct option longOptions[] =
{
{"port", required_argument, 0, 'p'},
{"addressFamily", required_argument, 0, 'a'},
{"ipcPort", required_argument, 0, 'i'},
{"bootstrap", required_argument, 0, 'b'},
{"endPointName", required_argument, 0, 'e'},
Expand All @@ -301,7 +304,7 @@ static int ParseOptions(int argc, char ** argv, Options * options)
{0, 0, 0, 0 }
};

int c = getopt_long(argc, argv, "p:i:b:e:vhl:df:", longOptions, &optionIndex);
int c = getopt_long(argc, argv, "p:a:i:b:e:vhl:df:", longOptions, &optionIndex);
if (c == -1)
{
break;
Expand All @@ -312,6 +315,9 @@ static int ParseOptions(int argc, char ** argv, Options * options)
case 'p':
options->CoapPort = atoi(optarg);
break;
case 'a':
options->AddressFamily = atoi(optarg) == 4 ? AF_INET : AF_INET6;
break;
case 'i':
options->IpcPort = atoi(optarg);
break;
Expand Down Expand Up @@ -362,6 +368,7 @@ int main(int argc, char ** argv)
.BootStrap = NULL,
.EndPointName = "imagination1",
.Logfile = NULL,
.AddressFamily = AF_INET,
.FactoryBootstrapInformation = NULL,
};

Expand Down
3 changes: 1 addition & 2 deletions core/src/server/lwm2m_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
************************************************************************************************************************/


#include <poll.h>
#include <stdio.h>
#include <getopt.h>
Expand Down Expand Up @@ -292,7 +291,7 @@ static int ParseOptions(int argc, char ** argv, Options * options)
{0, 0, 0, 0 }
};

int c = getopt_long(argc, argv, "a:c:f:p:i:m:vdl:h", longOptions, &optionIndex);
int c = getopt_long(argc, argv, "a:e:f:p:i:m:vdl:h", longOptions, &optionIndex);
if (c == -1)
{
break;
Expand Down