annotate mcabber/src/socket.c @ 26:8588f5a4b638

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