Project

General

Profile

Feature #1986 ยป racoon-login-output.diff

Jim Pingle, 11/01/2011 03:50 PM

View differences:

/root/ipsec-tools-modified/work/ipsec-tools-0.8.0/src/racoon/handler.c 2011-11-01 15:27:26.000000000 -0400
340 340
		pd->etype = iph1->etype;
341 341
		pd->created = iph1->created;
342 342
		pd->ph2cnt = iph1->ph2cnt;
343
#ifdef ENABLE_HYBRID
344
		if (iph1->mode_cfg == NULL) {
345
			/* Not a mobile client, so no login name */
346
			strncpy(pd->login, " ", LOGINLEN);
347
			pd->login[LOGINLEN] = '\0';
348
		} else {
349
			strncpy(pd->login, iph1->mode_cfg->login, LOGINLEN);
350
			pd->login[LOGINLEN] = '\0';
351
		}
352
#endif
343 353
		pd++;
344 354
	}
345 355

  
/root/ipsec-tools-modified/work/ipsec-tools-0.8.0/src/racoon/handler.h 2011-10-28 16:06:15.000000000 -0400
453 453
	u_int8_t etype;
454 454
	time_t created;
455 455
	int ph2cnt;
456
#ifdef ENABLE_HYBRID
457
#define LOGINLEN 31
458
	char login[LOGINLEN + 1];
459
#endif
456 460
};
457 461

  
458 462
struct sockaddr;
/root/ipsec-tools-modified/work/ipsec-tools-0.8.0/src/racoon/racoonctl.c 2011-10-31 14:30:04.000000000 -0400
1039 1039
/* semi long header;
1040 1040
 1234567890123456789012 0000000000000000:0000000000000000 00 X 00 X 0000-00-00 00:00:00 000000
1041 1041
*/
1042
#ifdef ENABLE_HYBRID
1043
char *header2 = 
1044
"Destination            Cookies                           ST S  V E Created             Phase2 Login";
1045
#else
1042 1046
char *header2 = 
1043 1047
"Destination            Cookies                           ST S  V E Created             Phase2";
1048
#endif
1044 1049

  
1045 1050
/* long header;
1046 1051
 0000:0000:0000:0000:0000:0000:0000:0000.00000 0000:0000:0000:0000:0000:0000:0000:0000.00000 0000000000000000:0000000000000000 00 X 00 X 0000-00-00 00:00:00 000000
......
1131 1136
		if (long_format >= 1)
1132 1137
			printf("%6d ", pd->ph2cnt);
1133 1138

  
1139
#ifdef ENABLE_HYBRID
1140
		if ((long_format >= 1) && (pd->login != NULL))
1141
			printf(" %s", pd->login);
1142
#endif
1134 1143
		printf("\n");
1135 1144

  
1136 1145
		pd++;
    (1-1/1)