bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added myname field

Browse Source
This commit is contained in:
Michiel Broek 2005-04-17 11:26:48 +00:00
parent a9753fbdb0
commit 2abb002c3c
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/mbselib.h
View File

@ -2041,7 +2041,8 @@ struct _ibcsrvhdr {
struct _ibcsrv { struct _ibcsrv {
char comment[41]; /* Comment */ char comment[41]; /* Comment */
char server[64]; /* Peer server name */ char server[64]; /* Peer FQDN server name */
char myname[64]; /* My FQDN server name */
char passwd[16]; /* Password */ char passwd[16]; /* Password */
unsigned Active : 1; /* Is server active */ unsigned Active : 1; /* Is server active */
unsigned Deleted : 1; /* Must server be deleted */ unsigned Deleted : 1; /* Must server be deleted */

42
mbtask/taskibc.c
View File

@ -44,6 +44,8 @@ time_t scfg_time = (time_t)0; /* Servers config time */
ncs_list *ncsl = NULL; /* Neighbours list */ ncs_list *ncsl = NULL; /* Neighbours list */
int ls; /* Listen socket */ int ls; /* Listen socket */
struct sockaddr_in myaddr_in; /* Listen socket address */ struct sockaddr_in myaddr_in; /* Listen socket address */
struct sockaddr_in clientaddr_in; /* Remote socket address */
typedef enum {NCS_INIT, NCS_CALL, NCS_WAITPWD, NCS_CONNECT, NCS_HANGUP, NCS_FAIL} NCSTYPE; typedef enum {NCS_INIT, NCS_CALL, NCS_WAITPWD, NCS_CONNECT, NCS_HANGUP, NCS_FAIL} NCSTYPE;
@ -115,6 +117,22 @@ void send_all(char *msg)
/*
* Send message to a server
*/
int send_msg(int s, struct sockaddr_in servaddr, char *host, char *msg)
{
Syslog('r', "> %s: %s", host, printable(msg, 0));
if (sendto(s, msg, strlen(msg), 0, (struct sockaddr *)&servaddr, sizeof(struct sockaddr_in)) == -1) {
Syslog('r', "$Can't send message");
return -1;
}
return 0;
}
void check_servers(void) void check_servers(void)
{ {
char *errmsg, scfgfn[PATH_MAX], buf[512]; char *errmsg, scfgfn[PATH_MAX], buf[512];
@ -243,15 +261,9 @@ void check_servers(void)
case NCS_CALL: Syslog('r', "%s call", tnsl->server); case NCS_CALL: Syslog('r', "%s call", tnsl->server);
sprintf(buf, "PASS %s 0000 IBC| %s\r", tnsl->passwd, tnsl->compress ? "Z":""); sprintf(buf, "PASS %s 0000 IBC| %s\r", tnsl->passwd, tnsl->compress ? "Z":"");
if (sendto(tnsl->socket, buf, strlen(buf), 0, send_msg(tnsl->socket, tnsl->servaddr_in, tnsl->server, buf);
(struct sockaddr *)&tnsl->servaddr_in, sizeof(struct sockaddr_in)) == -1) {
Syslog('r', "$Can't send message");
}
sprintf(buf, "SERVER seaport 0 %ld mbsebbs v%s\r", tnsl->token, VERSION); sprintf(buf, "SERVER seaport 0 %ld mbsebbs v%s\r", tnsl->token, VERSION);
if (sendto(tnsl->socket, buf, strlen(buf), 0, send_msg(tnsl->socket, tnsl->servaddr_in, tnsl->server, buf);
(struct sockaddr *)&tnsl->servaddr_in, sizeof(struct sockaddr_in)) == -1) {
Syslog('r', "$Can't send message");
}
tnsl->action = now + (time_t)50; tnsl->action = now + (time_t)50;
tnsl->state = NCS_WAITPWD; tnsl->state = NCS_WAITPWD;
changed = TRUE; changed = TRUE;
@ -281,9 +293,10 @@ void *ibc_thread(void *dummy)
{ {
struct servent *se; struct servent *se;
struct pollfd pfd; struct pollfd pfd;
struct hostent *hp;
int rc, len; int rc, len;
socklen_t sl; socklen_t sl;
char buf[1024]; char buf[1024], *hostname;
Syslog('+', "Starting IBC thread"); Syslog('+', "Starting IBC thread");
@ -333,12 +346,15 @@ void *ibc_thread(void *dummy)
if ((rc = poll(&pfd, 1, 1000) < 0)) { if ((rc = poll(&pfd, 1, 1000) < 0)) {
Syslog('r', "$poll/select failed"); Syslog('r', "$poll/select failed");
} else { } else {
Syslog('r', "poll_thread: poll interrupted rc=%d events=%04x", rc, pfd.revents);
if (pfd.revents & POLLIN || pfd.revents & POLLERR || pfd.revents & POLLHUP || pfd.revents & POLLNVAL) { if (pfd.revents & POLLIN || pfd.revents & POLLERR || pfd.revents & POLLHUP || pfd.revents & POLLNVAL) {
sl = sizeof(myaddr_in); sl = sizeof(myaddr_in);
if ((len = recvfrom(ls, &buf, sizeof(buf)-1, 0,(struct sockaddr *)&myaddr_in, &sl)) != -1) { if ((len = recvfrom(ls, &buf, sizeof(buf)-1, 0,(struct sockaddr *)&clientaddr_in, &sl)) != -1) {
Syslog('r', "< : \"%s\"", printable(buf, 0)); hp = gethostbyaddr((char *)&clientaddr_in.sin_addr, sizeof(struct in_addr), clientaddr_in.sin_family);
if (hp == NULL)
hostname = inet_ntoa(clientaddr_in.sin_addr);
else
hostname = hp->h_name;
Syslog('r', "< %s: \"%s\"", hostname, printable(buf, 0));
} else { } else {
Syslog('r', "recvfrom returned len=%d", len); Syslog('r', "recvfrom returned len=%d", len);
} }