annotate mcabber/socket.c @ 21:7eeda3a06b21

[/trunk] Changeset 36 by mikael * Translations, cleanups.
author mikael
date Sun, 27 Mar 2005 18:52:11 +0000
parents 0c2d2b79c4b5
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
1 #include <stdio.h>
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
2 #include <stdlib.h>
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
3 #include <string.h>
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
4 #include <sys/socket.h>
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
5 #include <unistd.h>
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
6 #include "utils.h"
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
7
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
8 #include "socket.h"
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
9 #include <signal.h>
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
10
21
7eeda3a06b21 [/trunk] Changeset 36 by mikael
mikael
parents: 19
diff changeset
11 #include "screen.h" // FIXME to be removed
7eeda3a06b21 [/trunk] Changeset 36 by mikael
mikael
parents: 19
diff changeset
12
0
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
13 /* Desc: create socket connection
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
14 *
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
15 * In : servername, port
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
16 * Out : socket (or -1 on error)
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
17 *
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
18 * Note: -
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
19 */
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
20 int sk_conn(struct sockaddr *name)
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
21 {
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
22 int sock;
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
23
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
24 if ((sock = socket(PF_INET, SOCK_STREAM, 0)) < 0) {
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
25 perror("socket (socket.c:23)");
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
26 return -1;
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
27 }
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
28
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
29 if (connect(sock, (struct sockaddr *) name, sizeof(struct sockaddr)) < 0) {
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
30 perror("connect (socket.c:29)");
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
31 return -1;
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
32 }
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
33
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
34 return sock;
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
35 }
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
36
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
37
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
38 /* Desc: send data through socket
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
39 *
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
40 * In : socket, buffer to send
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
41 * Out : 0 = fail, 1 = pass
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
42 *
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
43 * Note: -
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
44 */
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
45 int sk_send(int sock, char *buffer)
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
46 {
19
0c2d2b79c4b5 [/trunk] Changeset 34 by mikael
mikael
parents: 0
diff changeset
47 //ut_WriteLog("Sending:%s\n", buffer);
0
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
48 if ((send(sock, buffer, strlen(buffer), 0)) == -1)
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
49 return 0;
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
50 else
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
51 return 1;
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
52 }
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
53
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
54 /* Desc: receive data through socket
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
55 *
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
56 * In : socket
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
57 * Out : received buffer
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
58 *
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
59 * Note: it is up to the caller to free the returned string
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
60 */
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
61 char *sk_recv(int sock)
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
62 {
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
63 int i = 1;
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
64 int tambuffer = 128;
21
7eeda3a06b21 [/trunk] Changeset 36 by mikael
mikael
parents: 19
diff changeset
65 char mtag[16]; // For tag name
0
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
66
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
67 char *buffer = malloc(tambuffer);
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
68 char *retval = malloc(tambuffer + 1);
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
69
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
70 memset(retval, 0, tambuffer);
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
71 memset(buffer, 0, tambuffer + 1);
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
72
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
73 while (1) {
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
74 char *p1;
21
7eeda3a06b21 [/trunk] Changeset 36 by mikael
mikael
parents: 19
diff changeset
75 int n = recv(sock, buffer, tambuffer, 0);
7eeda3a06b21 [/trunk] Changeset 36 by mikael
mikael
parents: 19
diff changeset
76 if (n == -1) {
7eeda3a06b21 [/trunk] Changeset 36 by mikael
mikael
parents: 19
diff changeset
77 // Error
7eeda3a06b21 [/trunk] Changeset 36 by mikael
mikael
parents: 19
diff changeset
78 free(buffer);
7eeda3a06b21 [/trunk] Changeset 36 by mikael
mikael
parents: 19
diff changeset
79 retval[0] = 0;
7eeda3a06b21 [/trunk] Changeset 36 by mikael
mikael
parents: 19
diff changeset
80 return retval;
7eeda3a06b21 [/trunk] Changeset 36 by mikael
mikael
parents: 19
diff changeset
81 }
0
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
82
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
83 if (i == 1) {
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
84 char *p2;
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
85 strcpy(retval, buffer);
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
86 p1 = retval+1;
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
87 p2 = mtag;
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
88 while (('a' <= *p1) && (*p1 <= 'z') && (p2-mtag < 14))
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
89 *p2++ = *p1++;
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
90 *p2++ = '>'; *p2++ = 0;
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
91 //fprintf(stderr, "TAG=\"%s\"\n", mtag);
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
92 } else {
21
7eeda3a06b21 [/trunk] Changeset 36 by mikael
mikael
parents: 19
diff changeset
93 scr_LogPrint("Realloc %d [%d]", i-1, n);
7eeda3a06b21 [/trunk] Changeset 36 by mikael
mikael
parents: 19
diff changeset
94 if (!n)
7eeda3a06b21 [/trunk] Changeset 36 by mikael
mikael
parents: 19
diff changeset
95 break;
0
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
96 retval = realloc(retval, (tambuffer * i) + 1);
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
97 strncat(retval, buffer, tambuffer + 1);
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
98 }
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
99 i++;
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
100 p1 = retval + strlen(retval) - strlen(mtag);
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
101 //fprintf(stderr, "buffer:[%s]\n", buffer);
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
102 //fprintf(stderr, "End RET=[%s]\n", p1);
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
103 if (!strcmp(p1, mtag))
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
104 break;
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
105 for (p1 = retval; *p1 && (*p1 != '>'); p1++);
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
106 if ((*p1 == '>') && (*(p1-1) == '/'))
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
107 break;
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
108 memset(buffer, 0, tambuffer);
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
109 }
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
110 free(buffer);
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
111 ut_WriteLog("Received:%s\n", retval);
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
112 return retval;
b3b2332715fb Tailorization of /trunk
tailor@frmp8452
parents:
diff changeset
113 }