system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2008-06-11 Dan Williams <dcbw@redhat.com>

Browse source 
Patch from Tambet Ingo <tambet@gmail.com>

	* libnm-util/nm-setting-gsm.c
		- (verify): validate APN

	* src/nm-gsm-device.c
		- (manual_registration_done): start setting APN if needed
		- (set_apn, set_apn_done): set the APN
		- (do_dial): use the APN when dialing



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3750 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-06-11 18:08:35 +00:00
parent a172ccdd63
commit 99ef193601
3 changed files with 85 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2008-06-11 Dan Williams <dcbw@redhat.com>
Patch from Tambet Ingo <tambet@gmail.com>
* libnm-util/nm-setting-gsm.c
- (verify): validate APN
* src/nm-gsm-device.c
- (manual_registration_done): start setting APN if needed
- (set_apn, set_apn_done): set the APN
- (do_dial): use the APN when dialing
2008-06-11 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerSystem.c

5
libnm-util/nm-setting-gsm.c
View file

@ -54,6 +54,11 @@ verify (NMSetting *setting, GSList *all_settings)
return FALSE;
}
if (self->apn && (strlen (self->apn) < 1 || strchr (self->apn, '"'))) {
nm_warning ("Invalid APN");
return FALSE;
}
return TRUE;
}

72
src/nm-gsm-device.c
View file

@ -130,7 +130,7 @@ dial_done (NMSerialDevice *device,
}
static void
do_dial (NMSerialDevice *device)
do_dial (NMSerialDevice *device, guint cid)
{
NMSettingGsm *setting;
char *command;
@ -140,7 +140,20 @@ do_dial (NMSerialDevice *device)
setting = NM_SETTING_GSM (gsm_device_get_setting (NM_GSM_DEVICE (device), NM_TYPE_SETTING_GSM));
command = g_strconcat ("ATDT", setting->number, NULL);
if (cid) {
GString *str;
str = g_string_new ("ATD");
if (g_str_has_suffix (setting->number, "#"))
str = g_string_append_len (str, setting->number, strlen (setting->number) - 1);
else
str = g_string_append (str, setting->number);
g_string_append_printf (str, "***%d#", cid);
command = g_string_free (str, FALSE);
} else
command = g_strconcat ("ATDT", setting->number, NULL);
success = nm_serial_device_send_command_string (device, command);
g_free (command);
@ -155,6 +168,57 @@ do_dial (NMSerialDevice *device)
}
}
static void
set_apn_done (NMSerialDevice *device,
int reply_index,
gpointer user_data)
{
guint cid = GPOINTER_TO_UINT (user_data);
gsm_device_set_pending (NM_GSM_DEVICE (device), 0);
switch (reply_index) {
case 0:
do_dial (device, cid);
break;
default:
nm_warning ("Setting APN failed");
nm_device_state_changed (NM_DEVICE (device), NM_DEVICE_STATE_FAILED);
break;
}
}
static void
set_apn (NMSerialDevice *device)
{
NMSettingGsm *setting;
char *command;
char *responses[] = { "OK", "ERROR", NULL };
gboolean success;
guint id = 0;
guint cid = 1;
setting = NM_SETTING_GSM (gsm_device_get_setting (NM_GSM_DEVICE (device), NM_TYPE_SETTING_GSM));
if (!setting->apn) {
/* APN not set, nothing to do */
do_dial (device, 0);
return;
}
command = g_strdup_printf ("AT+CGDCONT=%d, \"IP\", \"%s\"", cid, setting->apn);
success = nm_serial_device_send_command_string (device, command);
g_free (command);
if (success)
id = nm_serial_device_wait_for_reply (device, 3, responses, responses, set_apn_done, GUINT_TO_POINTER (cid));
if (id)
gsm_device_set_pending (NM_GSM_DEVICE (device), id);
else
nm_device_state_changed (NM_DEVICE (device), NM_DEVICE_STATE_FAILED);
}
static void
manual_registration_done (NMSerialDevice *device,
int reply_index,
@ -164,7 +228,7 @@ manual_registration_done (NMSerialDevice *device,
switch (reply_index) {
case 0:
do_dial (device);
set_apn (device);
break;
case -1:
nm_warning ("Manual registration timed out");
@ -215,7 +279,7 @@ get_network_done (NMSerialDevice *device,
else
nm_warning ("Couldn't read active network name");
do_dial (device);
set_apn (device);
}
static void