mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct IP address verification; continue correctly even if it fails

Browse Source
This commit is contained in:
marschap
2005-12-15 12:04:53 +00:00
parent 4c07549b02
commit e88d8fd019
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/menuitem.c
+9 -6
View File
@@ -395,6 +395,7 @@ MenuItem *menuitem_create_ip (char *id, MenuEventFunc(*event_func),
new_item->data.ip.maxlength = ipinfo->maxlen;; new_item->data.ip.maxlength = ipinfo->maxlen;;
new_item->data.ip.value = malloc (new_item->data.ip.maxlength + 1); new_item->data.ip.value = malloc (new_item->data.ip.maxlength + 1);
if (ipinfo->verify) {
if (ipinfo->verify(value)) { if (ipinfo->verify(value)) {
strncpy(new_item->data.ip.value, value, new_item->data.ip.maxlength); strncpy(new_item->data.ip.value, value, new_item->data.ip.maxlength);
new_item->data.ip.value[new_item->data.ip.maxlength] = '\0'; new_item->data.ip.value[new_item->data.ip.maxlength] = '\0';
@@ -405,6 +406,7 @@ MenuItem *menuitem_create_ip (char *id, MenuEventFunc(*event_func),
strncpy(new_item->data.ip.value, ipinfo->dummy, new_item->data.ip.maxlength); strncpy(new_item->data.ip.value, ipinfo->dummy, new_item->data.ip.maxlength);
new_item->data.ip.value[new_item->data.ip.maxlength] = '\0'; new_item->data.ip.value[new_item->data.ip.maxlength] = '\0';
} }
}
new_item->data.ip.edit_str = malloc (new_item->data.ip.maxlength + 1); new_item->data.ip.edit_str = malloc (new_item->data.ip.maxlength + 1);
@@ -1332,9 +1334,11 @@ MenuResult menuitem_process_input_ip (MenuItem *item, MenuToken token, char * ke
return MENURESULT_NONE; return MENURESULT_NONE;
case MENUTOKEN_ENTER: case MENUTOKEN_ENTER:
if (extended || (pos >= item->data.ip.maxlength - 1)) { if (extended || (pos >= item->data.ip.maxlength - 1)) {
/* ** we do not need this; the verify function is clever enough **
// remove the leading spaces/zeros in each octet-representing string // remove the leading spaces/zeros in each octet-representing string
char *start = str; char tmp[40]; // 40 = max. length of IPv4 & IPv6 addresses incl. '\0'
char *start = tmp;
memccpy(tmp, str, '\0', sizeof(tmp));
while (start != NULL) { while (start != NULL) {
char *skip = start; char *skip = start;
@@ -1345,18 +1349,17 @@ MenuResult menuitem_process_input_ip (MenuItem *item, MenuToken token, char * ke
skip = strchr(start, ipinfo->sep); skip = strchr(start, ipinfo->sep);
start = (skip != NULL) ? (skip + 1) : NULL; start = (skip != NULL) ? (skip + 1) : NULL;
} }
*/
// check IP address entered // check IP address entered
if (!ipinfo->verify(item->data.ip.edit_str)) { if ((ipinfo->verify) && (!ipinfo->verify(tmp))) {
report(RPT_WARNING, "%s(id=\"%s\") ip address not verified: \"%s\"", report(RPT_WARNING, "%s(id=\"%s\") ip address not verified: \"%s\"",
__FUNCTION__, item->id, item->data.ip.edit_str); __FUNCTION__, item->id, tmp);
item->data.ip.error_code = 4; item->data.ip.error_code = 4;
return MENURESULT_NONE; return MENURESULT_NONE;
} }
// store value // store value
strcpy (item->data.ip.value, item->data.ip.edit_str); strcpy (item->data.ip.value, tmp);
// Inform client // Inform client
if (item->event_func) if (item->event_func)
server/sock.c
+2
View File
@@ -462,3 +462,5 @@ int verify_ipv6(const char *addr)
} }
return (result > 0) ? 1 : 0; return (result > 0) ? 1 : 0;
} }