Removed the dev_code, cli_code, and rev_level fields from the server session.

diff --git a/citadel/server/citserver.c b/citadel/server/citserver.c
index 016dad7b49cef1c0b56b8d5dc8b10dce56a9be09..183fe3c17714aec4677fd5c977d67c1c6cba26c4 100644 (file)
--- a/citadel/server/citserver.c
+++ b/citadel/server/citserver.c
@@ -185,6 +185,7 @@ void citproto_begin_session() {
        }
        else {
                cprintf("%d %s Citadel server ready.\n", CIT_OK, CtdlGetConfigStr("c_fqdn"));
+               strcpy(CC->cs_clientname, "Citadel client protocol");
                CC->can_receive_im = 1;
        }
 }

diff --git a/citadel/server/context.h b/citadel/server/context.h
index 1533156b1003b886288dc6f8df6d9e56913c040a..8eceac52e3753e6207e29bdc87dbba9d6f0c043e 100644 (file)
--- a/citadel/server/context.h
+++ b/citadel/server/context.h
@@ -77,9 +77,6 @@ struct CitContext {
        int can_receive_im;     /* Session is capable of receiving instant messages */
 
        /* Client information */
-       int cs_clientdev;       /* client developer ID */
-       int cs_clienttyp;       /* client type code */
-       int cs_clientver;       /* client version number */
        char cs_clientinfo[256];/* if its a unix domain socket, some info for logging. */
        uid_t cs_UDSclientUID;  /* the uid of the client when talking via UDS */
        char cs_clientname[32]; /* name of client software */

diff --git a/citadel/server/modules/ctdlproto/serv_file.c b/citadel/server/modules/ctdlproto/serv_file.c
index 230b6547658d1325ea5bf5278143904922756335..5ecd99562351d119ec80b020aba35009564bc1b8 100644 (file)
--- a/citadel/server/modules/ctdlproto/serv_file.c
+++ b/citadel/server/modules/ctdlproto/serv_file.c
@@ -514,14 +514,11 @@ void cmd_mesg(char *mname) {
        FILE *mfp;
        char targ[256];
        char buf[256];
-       char buf2[256];
        DIR *dp;
        struct dirent *d;
 
        extract_token(buf, mname, 0, '|', sizeof buf);
 
-       snprintf(buf2, sizeof buf2, "%s.%d.%d", buf, CC->cs_clientdev, CC->cs_clienttyp);
-
        // If the client requested "?" then produce a listing
        if (!strcmp(buf, "?")) {
                cprintf("%d %s\n", LISTING_FOLLOWS, buf);

diff --git a/citadel/server/modules/ctdlproto/serv_session.c b/citadel/server/modules/ctdlproto/serv_session.c
index 7547331dbba99053fb5c644d2a35a3e32dda09f0..79ed2d042739d0ff604ba52cf4deeb7b6f0d61a9 100644 (file)
--- a/citadel/server/modules/ctdlproto/serv_session.c
+++ b/citadel/server/modules/ctdlproto/serv_session.c
@@ -99,18 +99,12 @@ void cmd_iden(char *argbuf) {
                return;
        }
 
-       dev_code = extract_int(argbuf,0);
-       cli_code = extract_int(argbuf,1);
-       rev_level = extract_int(argbuf,2);
        extract_token(desc, argbuf, 3, '|', sizeof desc);
 
        safestrncpy(from_host, CtdlGetConfigStr("c_fqdn"), sizeof from_host);
        from_host[sizeof from_host - 1] = 0;
        if (num_parms(argbuf)>=5) extract_token(from_host, argbuf, 4, '|', sizeof from_host);
 
-       CC->cs_clientdev = dev_code;
-       CC->cs_clienttyp = cli_code;
-       CC->cs_clientver = rev_level;
        safestrncpy(CC->cs_clientname, desc, sizeof CC->cs_clientname);
        CC->cs_clientname[31] = 0;