vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Implement flow control for tftp.

Browse source 
* grub-core/net/net.c (receive_packets): Decrease the stop to 10
	packets but stop only if stop condition is satisfied.
	(grub_net_fs_read_real): Call packets_pulled after real read. Use
	`stall' instead of `eof' as stop condition.
	* grub-core/net/http.c (parse_line): Set `stall' on EOF.
	(http_err): Likewise.
	* grub-core/net/tftp.c (ack): Replace the first argument with data
	instead of socket.
	(tftp_receive): Stall if too many packets are in wait queue.
	(tftp_packets_pulled): New function.
	(grub_tftp_protocol): Set packets_pulled.
	* include/grub/net.h (grub_net_packets): New field count.
	(grub_net_put_packet): Increment count.
	(grub_net_remove_packet): Likewise.
	(grub_net_app_protocol): New field `packets_pulled'.
	(grub_net): New field `stall'.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-22 14:17:46 +02:00
parent 6b9cfac683
commit b27069e06d
5 changed files with 78 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/grub/net.h
View file

@ -93,6 +93,7 @@ typedef struct grub_net_packets
{
grub_net_packet_t *first;
grub_net_packet_t *last;
grub_size_t count;
} grub_net_packets_t;
#ifdef GRUB_MACHINE_EFI
@ -204,12 +205,16 @@ grub_net_put_packet (grub_net_packets_t *pkts, struct grub_net_buff *nb)
else
pkts->first = pkts->last = n;
pkts->count++;
return GRUB_ERR_NONE;
}
static inline void
grub_net_remove_packet (grub_net_packet_t *pkt)
{
pkt->up->count--;
if (pkt->prev)
pkt->prev->next = pkt->next;
else
@ -236,6 +241,7 @@ struct grub_net_app_protocol
grub_err_t (*open) (struct grub_file *file, const char *filename);
grub_err_t (*seek) (struct grub_file *file, grub_off_t off);
grub_err_t (*close) (struct grub_file *file);
grub_err_t (*packets_pulled) (struct grub_file *file);
};
typedef struct grub_net
@ -247,6 +253,7 @@ typedef struct grub_net
grub_off_t offset;
grub_fs_t fs;
int eof;
int stall;
} *grub_net_t;
extern grub_net_t (*EXPORT_VAR (grub_net_open)) (const char *name);