ipconfig.c (8a84fc15ae5cafcc366dd85cf8e1ab2040679abc) | ipconfig.c (e9ff3990f08e9a0c2839cc22808b01732ea5b3e4) |
---|---|
1/* 2 * $Id: ipconfig.c,v 1.46 2002/02/01 22:01:04 davem Exp $ 3 * 4 * Automatic Configuration of IP -- use DHCP, BOOTP, RARP, or 5 * user-supplied information to configure own IP address and routes. 6 * 7 * Copyright (C) 1996-1998 Martin Mares <mj@atrey.karlin.mff.cuni.cz> 8 * --- 791 unchanged lines hidden (view full) --- 800 if (servers > CONF_NAMESERVERS_MAX) 801 servers = CONF_NAMESERVERS_MAX; 802 for (i = 0; i < servers; i++) { 803 if (ic_nameservers[i] == INADDR_NONE) 804 memcpy(&ic_nameservers[i], ext+1+4*i, 4); 805 } 806 break; 807 case 12: /* Host name */ | 1/* 2 * $Id: ipconfig.c,v 1.46 2002/02/01 22:01:04 davem Exp $ 3 * 4 * Automatic Configuration of IP -- use DHCP, BOOTP, RARP, or 5 * user-supplied information to configure own IP address and routes. 6 * 7 * Copyright (C) 1996-1998 Martin Mares <mj@atrey.karlin.mff.cuni.cz> 8 * --- 791 unchanged lines hidden (view full) --- 800 if (servers > CONF_NAMESERVERS_MAX) 801 servers = CONF_NAMESERVERS_MAX; 802 for (i = 0; i < servers; i++) { 803 if (ic_nameservers[i] == INADDR_NONE) 804 memcpy(&ic_nameservers[i], ext+1+4*i, 4); 805 } 806 break; 807 case 12: /* Host name */ |
808 ic_bootp_string(system_utsname.nodename, ext+1, *ext, __NEW_UTS_LEN); | 808 ic_bootp_string(utsname()->nodename, ext+1, *ext, __NEW_UTS_LEN); |
809 ic_host_name_set = 1; 810 break; 811 case 15: /* Domain name (DNS) */ 812 ic_bootp_string(ic_domain, ext+1, *ext, sizeof(ic_domain)); 813 break; 814 case 17: /* Root path */ 815 if (!root_server_path[0]) 816 ic_bootp_string(root_server_path, ext+1, *ext, sizeof(root_server_path)); 817 break; 818 case 40: /* NIS Domain name (_not_ DNS) */ | 809 ic_host_name_set = 1; 810 break; 811 case 15: /* Domain name (DNS) */ 812 ic_bootp_string(ic_domain, ext+1, *ext, sizeof(ic_domain)); 813 break; 814 case 17: /* Root path */ 815 if (!root_server_path[0]) 816 ic_bootp_string(root_server_path, ext+1, *ext, sizeof(root_server_path)); 817 break; 818 case 40: /* NIS Domain name (_not_ DNS) */ |
819 ic_bootp_string(system_utsname.domainname, ext+1, *ext, __NEW_UTS_LEN); | 819 ic_bootp_string(utsname()->domainname, ext+1, *ext, __NEW_UTS_LEN); |
820 break; 821 } 822} 823 824 825/* 826 * Receive BOOTP reply. 827 */ --- 535 unchanged lines hidden (view full) --- 1363 * Clue in the operator. 1364 */ 1365 printk("IP-Config: Complete:"); 1366 printk("\n device=%s", ic_dev->name); 1367 printk(", addr=%u.%u.%u.%u", NIPQUAD(ic_myaddr)); 1368 printk(", mask=%u.%u.%u.%u", NIPQUAD(ic_netmask)); 1369 printk(", gw=%u.%u.%u.%u", NIPQUAD(ic_gateway)); 1370 printk(",\n host=%s, domain=%s, nis-domain=%s", | 820 break; 821 } 822} 823 824 825/* 826 * Receive BOOTP reply. 827 */ --- 535 unchanged lines hidden (view full) --- 1363 * Clue in the operator. 1364 */ 1365 printk("IP-Config: Complete:"); 1366 printk("\n device=%s", ic_dev->name); 1367 printk(", addr=%u.%u.%u.%u", NIPQUAD(ic_myaddr)); 1368 printk(", mask=%u.%u.%u.%u", NIPQUAD(ic_netmask)); 1369 printk(", gw=%u.%u.%u.%u", NIPQUAD(ic_gateway)); 1370 printk(",\n host=%s, domain=%s, nis-domain=%s", |
1371 system_utsname.nodename, ic_domain, system_utsname.domainname); | 1371 utsname()->nodename, ic_domain, utsname()->domainname); |
1372 printk(",\n bootserver=%u.%u.%u.%u", NIPQUAD(ic_servaddr)); 1373 printk(", rootserver=%u.%u.%u.%u", NIPQUAD(root_server_addr)); 1374 printk(", rootpath=%s", root_server_path); 1375 printk("\n"); 1376#endif /* !SILENT */ 1377 1378 return 0; 1379} --- 93 unchanged lines hidden (view full) --- 1473 break; 1474 case 3: 1475 if ((ic_netmask = in_aton(ip)) == INADDR_ANY) 1476 ic_netmask = INADDR_NONE; 1477 break; 1478 case 4: 1479 if ((dp = strchr(ip, '.'))) { 1480 *dp++ = '\0'; | 1372 printk(",\n bootserver=%u.%u.%u.%u", NIPQUAD(ic_servaddr)); 1373 printk(", rootserver=%u.%u.%u.%u", NIPQUAD(root_server_addr)); 1374 printk(", rootpath=%s", root_server_path); 1375 printk("\n"); 1376#endif /* !SILENT */ 1377 1378 return 0; 1379} --- 93 unchanged lines hidden (view full) --- 1473 break; 1474 case 3: 1475 if ((ic_netmask = in_aton(ip)) == INADDR_ANY) 1476 ic_netmask = INADDR_NONE; 1477 break; 1478 case 4: 1479 if ((dp = strchr(ip, '.'))) { 1480 *dp++ = '\0'; |
1481 strlcpy(system_utsname.domainname, dp, 1482 sizeof(system_utsname.domainname)); | 1481 strlcpy(utsname()->domainname, dp, 1482 sizeof(utsname()->domainname)); |
1483 } | 1483 } |
1484 strlcpy(system_utsname.nodename, ip, 1485 sizeof(system_utsname.nodename)); | 1484 strlcpy(utsname()->nodename, ip, 1485 sizeof(utsname()->nodename)); |
1486 ic_host_name_set = 1; 1487 break; 1488 case 5: 1489 strlcpy(user_dev_name, ip, sizeof(user_dev_name)); 1490 break; 1491 case 6: 1492 ic_proto_name(ip); 1493 break; --- 16 unchanged lines hidden --- | 1486 ic_host_name_set = 1; 1487 break; 1488 case 5: 1489 strlcpy(user_dev_name, ip, sizeof(user_dev_name)); 1490 break; 1491 case 6: 1492 ic_proto_name(ip); 1493 break; --- 16 unchanged lines hidden --- |