Skip to content

Commit

Permalink
Full network settings dialog box
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastien Bourdeauducq committed May 7, 2011
1 parent 850889d commit 7433d6b
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 29 deletions.
42 changes: 27 additions & 15 deletions src/sysconfig.c
View file
Expand Up @@ -292,30 +292,42 @@ static unsigned int route_get_gateway()

static void route_set_gateway(unsigned int ip)
{
struct sockaddr_in dst;
struct sockaddr_in oldgw;
struct sockaddr_in olddst;
struct sockaddr_in oldmask;
struct sockaddr_in gw;
struct sockaddr_in netmask;

dst.sin_len = sizeof(dst);
dst.sin_family = AF_INET;
dst.sin_addr.s_addr = 0;
memset(&olddst, 0, sizeof(olddst));
olddst.sin_len = sizeof(olddst);
olddst.sin_family = AF_INET;
olddst.sin_addr.s_addr = INADDR_ANY;

memset(&oldgw, 0, sizeof(oldgw));
oldgw.sin_len = sizeof(oldgw);
oldgw.sin_family = AF_INET;
oldgw.sin_addr.s_addr = INADDR_ANY;

memset(&oldmask, 0, sizeof(oldmask));
oldmask.sin_len = sizeof(oldmask);
oldmask.sin_family = AF_INET;
oldmask.sin_addr.s_addr = INADDR_ANY;

memset(&gw, 0, sizeof(gw));
gw.sin_len = sizeof(gw);
gw.sin_family = AF_INET;
gw.sin_addr.s_addr = ip;

netmask.sin_len = sizeof(netmask);
netmask.sin_family = AF_INET;
netmask.sin_addr.s_addr = 0xffffff00;
rtems_bsdnet_rtrequest(RTM_DELETE,
(struct sockaddr *)&olddst,
(struct sockaddr *)&oldgw,
(struct sockaddr *)&oldmask,
(RTF_UP | RTF_STATIC), NULL);

rtems_bsdnet_rtrequest(
RTM_ADD,
(struct sockaddr *)&dst,
rtems_bsdnet_rtrequest(RTM_ADD,
(struct sockaddr *)&olddst,
(struct sockaddr *)&gw,
(struct sockaddr *)&netmask,
RTF_STATIC | RTF_GATEWAY,
NULL
);
(struct sockaddr *)&oldmask,
(RTF_UP | RTF_GATEWAY | RTF_STATIC), NULL);
}

/* get */
Expand Down
70 changes: 56 additions & 14 deletions src/sysettings.c
View file
Expand Up @@ -17,6 +17,7 @@

#include <bsp.h>
#include <stdio.h>
#include <arpa/inet.h>
#include <mtklib.h>

#include "input.h"
Expand Down Expand Up @@ -333,8 +334,10 @@ static void update_network()
int dhcp_enable;
unsigned int ip;
unsigned int netmask;
unsigned int gateway;
unsigned int dns1, dns2;

sysconfig_get_ipconfig(&dhcp_enable, &ip, &netmask, NULL, NULL, NULL); // TODO
sysconfig_get_ipconfig(&dhcp_enable, &ip, &netmask, &gateway, &dns1, &dns2);
mtk_cmdf(appid, "b_dhcp.set(-state %s)", dhcp_enable ? "on" : "off");
mtk_cmdf(appid, "e_ip.set(-text \"%u.%u.%u.%u\")",
(ip & 0xff000000) >> 24,
Expand All @@ -346,8 +349,36 @@ static void update_network()
(netmask & 0x00ff0000) >> 16,
(netmask & 0x0000ff00) >> 8,
netmask & 0x000000ff);
if(gateway == 0)
mtk_cmd(appid, "e_gateway.set(-text \"\")");
else
mtk_cmdf(appid, "e_gateway.set(-text \"%u.%u.%u.%u\")",
(gateway & 0xff000000) >> 24,
(gateway & 0x00ff0000) >> 16,
(gateway & 0x0000ff00) >> 8,
gateway & 0x000000ff);
if(dns1 == 0)
mtk_cmd(appid, "e_dns.set(-text \"\")");
else if(dns2 == 0)
mtk_cmdf(appid, "e_dns.set(-text \"%u.%u.%u.%u\")",
(dns1 & 0xff000000) >> 24,
(dns1 & 0x00ff0000) >> 16,
(dns1 & 0x0000ff00) >> 8,
dns1 & 0x000000ff);
else
mtk_cmdf(appid, "e_dns.set(-text \"%u.%u.%u.%u,%u.%u.%u.%u\")",
(dns1 & 0xff000000) >> 24,
(dns1 & 0x00ff0000) >> 16,
(dns1 & 0x0000ff00) >> 8,
dns1 & 0x000000ff,
(dns2 & 0xff000000) >> 24,
(dns2 & 0x00ff0000) >> 16,
(dns2 & 0x0000ff00) >> 8,
dns2 & 0x000000ff);
mtk_cmdf(appid, "e_ip.set(-readonly %s)", dhcp_enable ? "yes" : "no");
mtk_cmdf(appid, "e_netmask.set(-readonly %s)", dhcp_enable ? "yes" : "no");
mtk_cmdf(appid, "e_gateway.set(-readonly %s)", dhcp_enable ? "yes" : "no");
mtk_cmdf(appid, "e_dns.set(-readonly %s)", dhcp_enable ? "yes" : "no");
}

static void update_credentials()
Expand Down Expand Up @@ -390,7 +421,7 @@ static int w_open;
static int previous_resolution;
static int previous_layout;
static int previous_dhcp;
static unsigned int previous_ip, previous_netmask;
static unsigned int previous_ip, previous_netmask, previous_gateway, previous_dns1, previous_dns2;

void open_sysettings_window()
{
Expand All @@ -409,23 +440,15 @@ void open_sysettings_window()
update_autostart();

previous_layout = sysconfig_get_keyboard_layout();
sysconfig_get_ipconfig(&previous_dhcp, &previous_ip, &previous_netmask, NULL, NULL, NULL); // TODO
sysconfig_get_ipconfig(&previous_dhcp, &previous_ip, &previous_netmask,
&previous_gateway, &previous_dns1, &previous_dns2);

mtk_cmd(appid, "w.open()");

next_update = rtems_clock_get_ticks_since_boot() + UPDATE_PERIOD;
input_add_callback(ip_update);
}

static unsigned int parse_ip(const char *ip)
{
unsigned int i[4];

if(sscanf(ip, "%u.%u.%u.%u", &i[0], &i[1], &i[2], &i[3]) != 4)
return 0;
return (i[0] << 24)|(i[1] << 16)|(i[2] << 8)|i[3];
}

static void close_sysettings_window(int save)
{
mtk_cmd(appid, "w.close()");
Expand All @@ -439,6 +462,10 @@ static void close_sysettings_window(int save)
char wallpaper[256];
char ip_txt[16];
char netmask_txt[16];
char gateway_txt[16];
char dns_txt[33];
char *c;
unsigned int dns1, dns2;
char login[32];
char password[32];
char autostart[256];
Expand All @@ -448,19 +475,34 @@ static void close_sysettings_window(int save)
mtk_req(appid, wallpaper, sizeof(wallpaper), "e_wallpaper.text");
mtk_req(appid, ip_txt, sizeof(ip_txt), "e_ip.text");
mtk_req(appid, netmask_txt, sizeof(netmask_txt), "e_netmask.text");
mtk_req(appid, gateway_txt, sizeof(gateway_txt), "e_gateway.text");
mtk_req(appid, dns_txt, sizeof(dns_txt), "e_dns.text");
mtk_req(appid, login, sizeof(login), "e_login.text");
mtk_req(appid, password, sizeof(password), "e_password.text");
mtk_req(appid, autostart, sizeof(autostart), "e_autostart.text");

dns1 = dns2 = 0;
if(dns_txt[0] != 0) {
c = strchr(dns_txt, ',');
if(c != NULL) {
*c = 0;
c++;
dns2 = inet_addr(c);
}
dns1 = inet_addr(dns_txt);
}

sysconfig_set_wallpaper(wallpaper);
sysconfig_set_ipconfig(-1, parse_ip(ip_txt), parse_ip(netmask_txt), 0, 0, 0); // TODO
sysconfig_set_ipconfig(-1, inet_addr(ip_txt), inet_addr(netmask_txt),
inet_addr(gateway_txt), dns1, dns2);
sysconfig_set_credentials(login, password);
sysconfig_set_autostart(autostart);

sysconfig_save();
} else {
sysconfig_set_resolution(previous_resolution);
sysconfig_set_keyboard_layout(previous_layout);
sysconfig_set_ipconfig(previous_dhcp, previous_ip, previous_netmask, 0, 0, 0); // TODO
sysconfig_set_ipconfig(previous_dhcp, previous_ip, previous_netmask,
previous_gateway, previous_dns1, previous_dns2);
}
}

0 comments on commit 7433d6b

Please sign in to comment.