Fix clear flags on points in nlookup if none
This commit is contained in:
		
							parent
							
								
									a387668a26
								
							
						
					
					
						commit
						2a1f00c21f
					
				
							
								
								
									
										3
									
								
								CHANGES
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								CHANGES
									
									
									
									
									
								
							| @ -302,3 +302,6 @@ Alexey Khromov (zx@zxalexis.ru) | |||||||
|     * INA in hidden flags sets remote address, protoflags change protocols |     * INA in hidden flags sets remote address, protoflags change protocols | ||||||
|     * ipaddr in hidden flags overwrites original and has max priority |     * ipaddr in hidden flags overwrites original and has max priority | ||||||
|     * phone in hidden lines do not affect ip callout in case without flags |     * phone in hidden lines do not affect ip callout in case without flags | ||||||
|  |      | ||||||
|  | 0.27.1 | ||||||
|  |  + Fixed clear flags in nlookup when none of them | ||||||
|  | |||||||
							
								
								
									
										4
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							| @ -1,3 +1,7 @@ | |||||||
|  | bforce (0.27.1) UNRELEASED; urgency=medium | ||||||
|  | 
 | ||||||
|  |   * Fixed clear flags on points in nlookup if none | ||||||
|  | 
 | ||||||
| bforce (0.27) UNRELEASED; urgency=medium | bforce (0.27) UNRELEASED; urgency=medium | ||||||
| 
 | 
 | ||||||
|   * Fixed warnings from PVS-Studio analyser |   * Fixed warnings from PVS-Studio analyser | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| Summary: Bforce, Fidonet mailer | Summary: Bforce, Fidonet mailer | ||||||
| Name: bforce | Name: bforce | ||||||
| Version: 0.27 | Version: 0.27.1 | ||||||
| Release: %{_vendor}1 | Release: %{_vendor}1 | ||||||
| Copyright: GPL | Copyright: GPL | ||||||
| Group: Fidonet/mailer | Group: Fidonet/mailer | ||||||
|  | |||||||
| @ -1 +1 @@ | |||||||
| 0.27 | 0.27.1 | ||||||
|  | |||||||
| @ -219,20 +219,23 @@ int nodelist_parsepoint(s_node *node, char *str) | |||||||
| 	cnt = string_parse(argv, NODELIST_POSFLAGS+1, str, ','); | 	cnt = string_parse(argv, NODELIST_POSFLAGS+1, str, ','); | ||||||
| 	if( cnt < NODELIST_POSFLAGS-1 ) | 	if( cnt < NODELIST_POSFLAGS-1 ) | ||||||
| 		return -1; | 		return -1; | ||||||
| 	DEB((D_NODELIST,"nodelist: parsepoint OK: %d", cnt)); | 	//DEB((D_NODELIST,"nodelist: parsepoint OK: %d", cnt));
 | ||||||
| 	strnxcpy(node->name, argv[NODELIST_POSNAME], sizeof(node->name)); | 	strnxcpy(node->name, argv[NODELIST_POSNAME], sizeof(node->name)); | ||||||
| 	DEB((D_NODELIST,"nodelist: parsepoint sys: %s", node->name)); | 	//DEB((D_NODELIST,"nodelist: parsepoint sys: %s", node->name));
 | ||||||
| 	strnxcpy(node->location, argv[NODELIST_POSLOCATION], sizeof(node->location)); | 	strnxcpy(node->location, argv[NODELIST_POSLOCATION], sizeof(node->location)); | ||||||
| 	DEB((D_NODELIST,"nodelist: parsepoint loc: %s", node->location)); | 	//DEB((D_NODELIST,"nodelist: parsepoint loc: %s", node->location));
 | ||||||
| 	strnxcpy(node->sysop, argv[NODELIST_POSSYSOP], sizeof(node->sysop)); | 	strnxcpy(node->sysop, argv[NODELIST_POSSYSOP], sizeof(node->sysop)); | ||||||
| 	DEB((D_NODELIST,"nodelist: parsepoint zyz: %s", node->sysop)); | 	//DEB((D_NODELIST,"nodelist: parsepoint zyz: %s", node->sysop));
 | ||||||
| 	strnxcpy(node->phone, argv[NODELIST_POSPHONE], sizeof(node->phone)); | 	strnxcpy(node->phone, argv[NODELIST_POSPHONE], sizeof(node->phone)); | ||||||
| 	DEB((D_NODELIST,"nodelist: parsepoint pho: %s", node->phone)); | 	//DEB((D_NODELIST,"nodelist: parsepoint pho: %s", node->phone));
 | ||||||
| 	if (argv[NODELIST_POSFLAGS]) | 	if (argv[NODELIST_POSFLAGS]) | ||||||
| 	 	strnxcpy(node->flags, argv[NODELIST_POSFLAGS], sizeof(node->flags)); | 	 	strnxcpy(node->flags, argv[NODELIST_POSFLAGS], sizeof(node->flags)); | ||||||
| 	else | 	else { | ||||||
| 		memset(node->flags,'\0',sizeof(node->flags)); | 		//DEB((D_NODELIST,"nodelist: no flags"));
 | ||||||
| 	DEB((D_NODELIST,"nodelist: parsepoint fl: %s", node->flags)); | 		//memset(node->flags,'\0',sizeof(node->flags));
 | ||||||
|  | 		strnxcpy(node->flags, "<no flags>", sizeof(node->flags)); | ||||||
|  | 	} | ||||||
|  | 	//DEB((D_NODELIST,"nodelist: parsepoint fl: %s", node->flags));
 | ||||||
| 	if (argv[NODELIST_POSSPEED]) | 	if (argv[NODELIST_POSSPEED]) | ||||||
| 		node->speed = atoi(argv[NODELIST_POSSPEED]); | 		node->speed = atoi(argv[NODELIST_POSSPEED]); | ||||||
| 	DEB((D_NODELIST, "nodelist: Parsed common values SYS: %s, ZYZ: %s, LOC: %s, PHONE: %s", node->name, node->sysop, node->location, node->phone)); | 	DEB((D_NODELIST, "nodelist: Parsed common values SYS: %s, ZYZ: %s, LOC: %s, PHONE: %s", node->name, node->sysop, node->location, node->phone)); | ||||||
|  | |||||||
| @ -613,8 +613,8 @@ int string_parse(char **dest, int items, char *str, int separator) | |||||||
| 		if( *((unsigned char *)p) == separator ) | 		if( *((unsigned char *)p) == separator ) | ||||||
| 		{ | 		{ | ||||||
| 			*p++ = '\0'; | 			*p++ = '\0'; | ||||||
| //			DEB((D_INDEX,"Parsed string: %s", dest[count]));
 |  | ||||||
| 			dest[count++] = p; | 			dest[count++] = p; | ||||||
|  | 			//DEB((D_NODELIST,"Parsed string: %s", dest[count-1]));
 | ||||||
| 		} else | 		} else | ||||||
| 			++p; | 			++p; | ||||||
| 	} | 	} | ||||||
|  | |||||||
| @ -71,6 +71,7 @@ void print_nodeinfo(const s_node *node) | |||||||
| 	printf("Sysop     : %s\n", node->sysop); | 	printf("Sysop     : %s\n", node->sysop); | ||||||
| 	printf("Location  : %s\n", node->location); | 	printf("Location  : %s\n", node->location); | ||||||
| 	printf("Speed     : %ld\n", node->speed); | 	printf("Speed     : %ld\n", node->speed); | ||||||
|  | 	if (node->flags) | ||||||
| 		printf("Flags     : %s\n", node->flags); | 		printf("Flags     : %s\n", node->flags); | ||||||
| 
 | 
 | ||||||
| 	if( node->worktime.num ) | 	if( node->worktime.num ) | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user