Virtualization
/
SLOF
mirror of https://gitlab.com/qemu-project/SLOF.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dhcp: fix warning messages when calling strtoip() 

With the removal of dupicate strtoip in patch "dhcp: Remove duplicated
strtoip()" (commit 896e31da2c), we get
following warnings messages:

dhcp.c: In function ‘dhcpv4’:
dhcp.c:215:16: warning: pointer targets in passing argument 1 of ‘strtoip’ differ in signedness [-Wpointer-sign]
   if (!strtoip(dhcp_tftp_name, (uint8_t *)&dhcp_tftp_ip)) {
                ^
In file included from dhcp.c:51:0:
../netapps/args.h:20:5: note: expected ‘const char *’ but argument is of type ‘int8_t * {aka signed char *}’
 int strtoip(const char *, char[4]);
     ^
dhcp.c:215:32: warning: pointer targets in passing argument 2 of ‘strtoip’ differ in signedness [-Wpointer-sign]
   if (!strtoip(dhcp_tftp_name, (uint8_t *)&dhcp_tftp_ip)) {
                                ^
In file included from dhcp.c:51:0:
../netapps/args.h:20:5: note: expected ‘char *’ but argument is of type ‘uint8_t * {aka unsigned char *}’
 int strtoip(const char *, char[4]);
     ^

There were unnecessary typecasts which could be removed by declaring
dhcp_tftp_name and dhcp_filename. Along with this, change the dns_get_ip
signature as well to reduce typecast.

Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
This commit is contained in:
Nikunj A Dadhania 2016-02-10 14:00:39 +05:30 committed by Alexey Kardashevskiy
parent d8296da896
commit 405d2ffc40
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/net-snk/app/netapps/netboot.c
View File

@ -844,7 +844,7 @@ int parse_tftp_args(char buffer[], char *server_ip, char filename[], int fd,
tmp = raw + 7; tmp = raw + 7;
tmp[j] = '\0'; tmp[j] = '\0';
strcpy(domainname, tmp); strcpy(domainname, tmp);
if (dns_get_ip(fd, (int8_t *)domainname, server_ip6, 6) == 0) { if (dns_get_ip(fd, domainname, server_ip6, 6) == 0) {
printf("\n DNS failed for IPV6\n"); printf("\n DNS failed for IPV6\n");
return -1; return -1;
} }

16
clients/net-snk/app/netlib/dhcp.c
View File

@ -164,8 +164,8 @@ static uint8_t ether_packet[ETH_MTU_SIZE];
static uint32_t dhcp_own_ip = 0; static uint32_t dhcp_own_ip = 0;
static uint32_t dhcp_server_ip = 0; static uint32_t dhcp_server_ip = 0;
static uint32_t dhcp_siaddr_ip = 0; static uint32_t dhcp_siaddr_ip = 0;
static int8_t dhcp_filename[256]; static char dhcp_filename[256];
static int8_t dhcp_tftp_name[256]; static char dhcp_tftp_name[256];
static uint32_t dhcp_xid; static uint32_t dhcp_xid;
static char * response_buffer; static char * response_buffer;
@ -182,8 +182,8 @@ int32_t dhcpv4(char *ret_buffer, filename_ip_t *fn_ip)
uint32_t dhcp_tftp_ip = 0; uint32_t dhcp_tftp_ip = 0;
int fd = fn_ip->fd; int fd = fn_ip->fd;
strcpy((char *) dhcp_filename, ""); strcpy(dhcp_filename, "");
strcpy((char *) dhcp_tftp_name, ""); strcpy(dhcp_tftp_name, "");
response_buffer = ret_buffer; response_buffer = ret_buffer;
@ -197,11 +197,11 @@ int32_t dhcpv4(char *ret_buffer, filename_ip_t *fn_ip)
dhcp_siaddr_ip = fn_ip->server_ip; dhcp_siaddr_ip = fn_ip->server_ip;
} }
if(fn_ip->filename[0] != 0) { if(fn_ip->filename[0] != 0) {
strcpy((char *) dhcp_filename, (char *) fn_ip->filename); strcpy(dhcp_filename, (char *) fn_ip->filename);
} }
// TFTP SERVER // TFTP SERVER
if (!strlen((char *) dhcp_tftp_name)) { if (!strlen(dhcp_tftp_name)) {
if (!dhcp_siaddr_ip) { if (!dhcp_siaddr_ip) {
// ERROR: TFTP name is not presented // ERROR: TFTP name is not presented
return -3; return -3;
@ -212,7 +212,7 @@ int32_t dhcpv4(char *ret_buffer, filename_ip_t *fn_ip)
} }
else { else {
// TFTP server defined by its name // TFTP server defined by its name
if (!strtoip(dhcp_tftp_name, (uint8_t *)&dhcp_tftp_ip)) { if (!strtoip(dhcp_tftp_name, (char *)&dhcp_tftp_ip)) {
if (!dns_get_ip(fd, dhcp_tftp_name, (uint8_t *)&dhcp_tftp_ip, 4)) { if (!dns_get_ip(fd, dhcp_tftp_name, (uint8_t *)&dhcp_tftp_ip, 4)) {
// DNS error - can't obtain TFTP-server name // DNS error - can't obtain TFTP-server name
// Use TFTP-ip from siaddr field, if presented // Use TFTP-ip from siaddr field, if presented
@ -230,7 +230,7 @@ int32_t dhcpv4(char *ret_buffer, filename_ip_t *fn_ip)
// Store configuration info into filename_ip strucutre // Store configuration info into filename_ip strucutre
fn_ip -> own_ip = dhcp_own_ip; fn_ip -> own_ip = dhcp_own_ip;
fn_ip -> server_ip = dhcp_tftp_ip; fn_ip -> server_ip = dhcp_tftp_ip;
strcpy((char *) fn_ip -> filename, (char *) dhcp_filename); strcpy((char *) fn_ip -> filename, dhcp_filename);
return 0; return 0;
} }

4
clients/net-snk/app/netlib/dns.c
View File

@ -133,7 +133,7 @@ dns_init(uint32_t _dns_server_ip, uint8_t _dns_server_ipv6[16], uint8_t ip_versi
* FALSE - error condition occurs. * FALSE - error condition occurs.
*/ */
int8_t int8_t
dns_get_ip(int fd, int8_t * url, uint8_t * domain_ip, uint8_t ip_version) dns_get_ip(int fd, char* url, uint8_t * domain_ip, uint8_t ip_version)
{ {
/* this counter is used so that we abort after 30 DNS request */ /* this counter is used so that we abort after 30 DNS request */
int32_t i; int32_t i;
@ -143,7 +143,7 @@ dns_get_ip(int fd, int8_t * url, uint8_t * domain_ip, uint8_t ip_version)
(* domain_ip) = 0; (* domain_ip) = 0;
// Retrieve host name from URL // Retrieve host name from URL
if (!urltohost((char *) url, (char *) host_name)) { if (!urltohost(url, (char *) host_name)) {
printf("\nERROR:\t\t\tBad URL!\n"); printf("\nERROR:\t\t\tBad URL!\n");
return 0; return 0;
} }

2
clients/net-snk/app/netlib/dns.h
View File

@ -20,7 +20,7 @@
extern int8_t dns_init(uint32_t _dns_server_ip, uint8_t _dns_server_ipv6[16], uint8_t ip_version); extern int8_t dns_init(uint32_t _dns_server_ip, uint8_t _dns_server_ipv6[16], uint8_t ip_version);
/* For given URL retrieves IPv4 from DNS-server. */ /* For given URL retrieves IPv4 from DNS-server. */
extern int8_t dns_get_ip(int fd, int8_t * url, uint8_t * domain_ip, uint8_t ip_version); extern int8_t dns_get_ip(int fd, char * url, uint8_t * domain_ip, uint8_t ip_version);
/* Handles DNS-packets, which are detected by receive_ether. */ /* Handles DNS-packets, which are detected by receive_ether. */
extern int32_t handle_dns(uint8_t * packet, int32_t packetsize); extern int32_t handle_dns(uint8_t * packet, int32_t packetsize);