projects / packages / clamav.git / blame
| Commit | Line | Data |
|---|---|---|
| 32b1d1ee AM |
1 | --- clamav-0.98.1/freshclam/notify.c.org 2014-03-15 12:30:42.386370064 +0100 |
| 2 | +++ clamav-0.98.1/freshclam/notify.c 2014-03-15 12:37:47.097443450 +0100 | |
| 3 | @@ -82,8 +82,8 @@ | |
| 4 | ||
| 5 | if ((sockd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) | |
| 6 | { | |
| 7 | - perror ("socket()"); | |
| 8 | - logg ("^Clamd was NOT notified: Can't create socket endpoint for %s\n", opt->strarg); | |
| 9 | + logg ("^Clamd was NOT notified: Can't create socket endpoint for %s: %s\n", | |
| 10 | + opt->strarg, strerror(errno)); | |
| 11 | optfree (opts); | |
| 12 | return -1; | |
| 13 | } | |
| 14 | @@ -92,9 +92,9 @@ | |
| 15 | (sockd, (struct sockaddr *) &server, | |
| 16 | sizeof (struct sockaddr_un)) < 0) | |
| 17 | { | |
| 18 | - perror ("connect()"); | |
| 19 | + logg ("^Clamd was NOT notified: Can't connect to clamd through %s: %s\n", | |
| 20 | + opt->strarg, strerror(errno)); | |
| 21 | closesocket (sockd); | |
| 22 | - logg ("^Clamd was NOT notified: Can't connect to clamd through %s\n", opt->strarg); | |
| 23 | optfree (opts); | |
| 24 | return -11; | |
| 25 | } | |
| 26 | @@ -137,8 +137,7 @@ | |
| 27 | ||
| 28 | if ((sockd = socket (res->ai_family, SOCK_STREAM, 0)) < 0) | |
| 29 | { | |
| 30 | - perror ("socket()"); | |
| 31 | - logg ("!%s: Can't create TCP socket\n", option); | |
| 32 | + logg ("!%s: Can't create TCP socket: %s\n", option, strerror(errno)); | |
| 33 | optfree (opts); | |
| 34 | freeaddrinfo (res); | |
| 35 | return -1; | |
| 36 | @@ -146,10 +145,9 @@ | |
| 37 | ||
| 38 | if (connect (sockd, res->ai_addr, res->ai_addrlen) == -1) | |
| 39 | { | |
| 40 | - perror ("connect()"); | |
| 41 | + logg ("!%s: Can't connect to clamd on %s:%s: %s\n", option, | |
| 42 | + addr ? addr : "localhost", port, strerror(errno)); | |
| 43 | closesocket (sockd); | |
| 44 | - logg ("!%s: Can't connect to clamd on %s:%s\n", option, | |
| 45 | - addr ? addr : "localhost", port); | |
| 46 | optfree (opts); | |
| 47 | freeaddrinfo (res); | |
| 48 | return -1; | |
| 49 | @@ -160,8 +158,7 @@ | |
| 50 | ||
| 51 | if ((sockd = socket (AF_INET, SOCK_STREAM, 0)) < 0) | |
| 52 | { | |
| 53 | - perror ("socket()"); | |
| 54 | - logg ("!%s: Can't create TCP socket\n", option); | |
| 55 | + logg ("!%s: Can't create TCP socket: %s\n", option, strerror(errno)); | |
| 56 | optfree (opts); | |
| 57 | return -1; | |
| 58 | } | |
| 59 | @@ -173,8 +170,8 @@ | |
| 60 | { | |
| 61 | if ((he = gethostbyname (opt->strarg)) == 0) | |
| 62 | { | |
| 63 | - perror ("gethostbyname()"); | |
| 64 | - logg ("^Clamd was NOT notified: Can't resolve hostname '%s'\n", opt->strarg); | |
| 65 | + logg ("^Clamd was NOT notified: Can't resolve hostname '%s': %s\n", | |
| 66 | + opt->strarg, strerror(errno)); | |
| 67 | optfree (opts); | |
| 68 | closesocket (sockd); | |
| 69 | return -1; | |
| 70 | @@ -189,9 +186,9 @@ | |
| 71 | (sockd, (struct sockaddr *) &server2, | |
| 72 | sizeof (struct sockaddr_in)) < 0) | |
| 73 | { | |
| 74 | - perror ("connect()"); | |
| 75 | + logg ("^Clamd was NOT notified: Can't connect to clamd on %s:%d: %s\n", | |
| 76 | + inet_ntoa (server2.sin_addr), ntohs (server2.sin_port), strerror(errno)); | |
| 77 | closesocket (sockd); | |
| 78 | - logg ("^Clamd was NOT notified: Can't connect to clamd on %s:%d\n", inet_ntoa (server2.sin_addr), ntohs (server2.sin_port)); | |
| 79 | optfree (opts); | |
| 80 | return -1; | |
| 81 | } | |
| 82 | @@ -222,8 +219,7 @@ | |
| 83 | ||
| 84 | if (sendln (sockd, "RELOAD", 7) < 0) | |
| 85 | { | |
| 86 | - perror ("send()"); | |
| 87 | - logg ("!NotifyClamd: Could not write to clamd socket\n"); | |
| 88 | + logg ("!NotifyClamd: Could not write to clamd socket: %s\n", strerror(errno)); | |
| 89 | closesocket (sockd); | |
| 90 | return 1; | |
| 91 | } |